2 files changed, 25 insertions, 1 deletions
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 0d5c0bbdc..c1ed72214 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -140,7 +140,17 @@ var IPA = function() {
             }
         }));
 
-
+        batch.add_command(IPA.command({
+            entity: 'trustconfig',
+            method: 'show',
+            retry: false,
+            on_success: function(data, text_status, xhr) {
+                that.trust_enabled = true;
+            },
+            on_error: function(xhr, text_status, error_thrown) {
+                that.trust_enabled = false;
+            }
+        }));
 
         batch.execute();
     };
diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index 25ddb5cdf..7f4f054d1 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -28,6 +28,13 @@ IPA.trust.entity = function(spec) {
     var that = IPA.entity(spec);
 
     that.init = function() {
+
+        if (!IPA.trust_enabled) {
+            throw {
+                expected: true
+            };
+        }
+
         that.entity_init();
 
         that.builder.search_facet({
@@ -198,6 +205,13 @@ IPA.trust.config_entity = function(spec) {
     var that = IPA.entity(spec);
 
     that.init = function() {
+
+        if (!IPA.trust_enabled) {
+            throw {
+                expected: true
+            };
+        }
+
         that.entity_init();
 
         that.builder.details_facet({