diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
index 56c5b21421..2f3dc48a41 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
@@ -649,8 +649,7 @@ module.controller('GenericUserFederationCtrl', function($scope, $location, Notif
 
                 for (var i = 0; i < providerFactory.properties.length; i++) {
                     var configProperty = providerFactory.properties[i];
-                    var configValue = configProperty.type == "boolean" ? (configProperty.defaultValue === true ? 'true' : 'false') : configProperty.defaultValue;
-                    instance.config[configProperty.name] = configValue;
+                    instance.config[configProperty.name] = configProperty.defaultValue;
                 }
             }
 
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java
index 82715c912a..fc8b8d6227 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java
@@ -103,7 +103,7 @@ public class DummyUserFederationProviderFactory implements UserFederationProvide
         ProviderConfigProperty prop2 = new ProviderConfigProperty();
         prop2.setName("prop2");
         prop2.setLabel("Prop2");
-        prop2.setDefaultValue(true);
+        prop2.setDefaultValue("true");
         prop2.setHelpText("Prop2 HelpText");
         prop2.setType(ProviderConfigProperty.BOOLEAN_TYPE);