diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js
index a8d49eb90..b557bbcef 100644
--- a/install/ui/src/freeipa/details.js
+++ b/install/ui/src/freeipa/details.js
@@ -1536,8 +1536,6 @@ exp.boolean_state_evaluator = IPA.boolean_state_evaluator = function(spec) {
 
     that.param = spec.param || that.field_name;
 
-    that.adapter = builder.build('adapter', spec.adapter || 'adapter', { context: that });
-
     /**
      * State to set when value is `true`
      * @property {string}
@@ -1643,8 +1641,6 @@ exp.acl_state_evaluator = IPA.acl_state_evaluator = function(spec) {
 
     that.param = spec.param || 'attributelevelrights';
 
-    that.adapter = builder.build('adapter', spec.adapter || 'adapter', { context: that });
-
     /**
      * @inheritDoc
      */
@@ -1687,7 +1683,6 @@ exp.value_state_evaluator = IPA.value_state_evaluator = function(spec) {
 
     spec.name = spec.name || 'value_state_evaluator';
     spec.event = spec.event || 'post_load';
-    spec.adapter = spec.adapter || {};
 
     var that = IPA.state_evaluator(spec);
 
@@ -1712,9 +1707,6 @@ exp.value_state_evaluator = IPA.value_state_evaluator = function(spec) {
      */
     that.representation = spec.representation;
 
-    that.adapter = builder.build('adapter',
-                    spec.adapter, { context: that });
-
     that.param = spec.param;
 
     /**
@@ -1798,7 +1790,6 @@ exp.has_keytab_evaluator = IPA.has_keytab_evaluator = function(spec) {
     spec.value = spec.value || [true];
     spec.representation = spec.representation || 'has_keytab';
     spec.param = spec.param || 'has_keytab';
-    spec.adapter = spec.adapter || { $type: 'adapter' };
 
     var that = IPA.value_state_evaluator(spec);
 
@@ -1823,8 +1814,6 @@ exp.object_class_evaluator = IPA.object_class_evaluator = function(spec) {
 
     var that = IPA.state_evaluator(spec);
 
-    that.adapter = builder.build('adapter', spec.adapter || 'adapter', { context: that });
-
     /**
      * @inheritDoc
      */
diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js
index d7702695d..49cbfeab0 100644
--- a/install/ui/src/freeipa/facet.js
+++ b/install/ui/src/freeipa/facet.js
@@ -3187,6 +3187,13 @@ exp.state_evaluator = IPA.state_evaluator = function(spec) {
      */
     that.first_pass = true;
 
+    /**
+     * Adapter which selects values from record on load.
+     *
+     * @property {IPA.Adapter}
+     */
+    that.adapter = builder.build('adapter', spec.adapter || 'adapter', { context: that });
+
     /**
      * Init the evaluator
      *
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index a4d18e17d..81b6a3fc5 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -1105,7 +1105,6 @@ IPA.host.has_password_evaluator = function(spec) {
     spec.value = spec.value || [true];
     spec.representation = spec.representation || 'has_password';
     spec.param = spec.param || 'has_password';
-    spec.adapter = spec.adapter || { $type: 'adapter' };
 
     var that = IPA.value_state_evaluator(spec);
 
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index 2e329292c..a4eb390b7 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -948,7 +948,6 @@ IPA.user.self_service_other_user_evaluator = function(spec) {
     var that = IPA.state_evaluator(spec);
     that.name = spec.name || 'self_service_other_user_evaluator';
     that.param = spec.param || 'uid';
-    that.adapter = builder.build('adapter', spec.adapter || 'adapter', { context: that });
 
     /**
      * Evaluates if user is in self-service and viewing himself
@@ -982,7 +981,6 @@ IPA.user.preserved_user_evaluator = function(spec) {
     var that = IPA.state_evaluator(spec);
     that.name = spec.name || 'preserved_user_evaluator';
     that.param = spec.param || 'dn';
-    that.adapter = builder.build('adapter', { $type: 'adapter'}, { context: that });
 
     /**
      * Evaluates if user is preserved, i.e. is in provisioning tree