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 f4059944b8..93e321bf15 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
@@ -806,7 +806,7 @@ module.controller('UserFederationMapperListCtrl', function($scope, $location, No
 
     $scope.hasAnyMapperTypes = false;
     for (var property in mapperTypes) {
-        if (!(property.startsWith('$'))) {
+        if (!(property.indexOf('$') === 0)) {
             $scope.hasAnyMapperTypes = true;
             break;
         }
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java
index e29a2b8e9a..c13c9bc250 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java
@@ -155,7 +155,7 @@ public class SyncProvidersTest {
     }
 
     @Test
-    public void test02duplicateUsernameSync() {
+    public void test02duplicateUsernameAndEmailSync() {
         LDAPObject duplicatedLdapUser;
 
         KeycloakSession session = keycloakRule.startSession();
@@ -168,8 +168,6 @@ public class SyncProvidersTest {
             // Add user to LDAP with duplicated username "user7"
             duplicatedLdapUser = FederationTestUtils.addLDAPUser(ldapFedProvider, testRealm, "user7", "User7FN", "User7LN", "user7-something@email.org", null, "126");
 
-            // Add user to LDAP with duplicated email "user7@email.org"
-            //FederationTestUtils.addLDAPUser(ldapFedProvider, testRealm, "user7-something", "User7FNN", "User7LNL", "user7@email.org", null, "126");
         } finally {
             keycloakRule.stopSession(session, true);
         }