keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractAccountPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractAccountPage.java
index 5a67c8a..976f211 100755
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractAccountPage.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractAccountPage.java
@@ -46,7 +46,7 @@ public abstract class AbstractAccountPage extends AbstractPage {
     }
 
     public void openLanguage(String language){
-        WebElement langLink = localeDropdown.findElement(By.id("kc-locale-" + language));
+        WebElement langLink = localeDropdown.findElement(By.xpath("//a[text()='" +language +"']"));
         String url = langLink.getAttribute("href");
         driver.navigate().to(url);
     }

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java
index e7a75a5..78913d6 100755
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java
@@ -184,7 +184,7 @@ public class LoginPage extends AbstractPage {
     }
 
     public void openLanguage(String language){
-        WebElement langLink = localeDropdown.findElement(By.id("kc-locale-" + language));
+        WebElement langLink = localeDropdown.findElement(By.xpath("//a[text()='" +language +"']"));
         String url = langLink.getAttribute("href");
         driver.navigate().to(url);
     }

diff --git a/themes/src/main/resources/theme/base/account/template.ftl b/themes/src/main/resources/theme/base/account/template.ftl
index aa50661..c117cff 100644
--- a/themes/src/main/resources/theme/base/account/template.ftl
+++ b/themes/src/main/resources/theme/base/account/template.ftl
@@ -37,7 +37,7 @@
                                     <a href="#" id="kc-current-locale-link">${locale.current}</a>
                                     <ul>
                                         <#list locale.supported as l>
-                                            <li class="kc-dropdown-item"><a href="${l.url}" id="kc-locale-${l.label}">${l.label}</a></li>
+                                            <li class="kc-dropdown-item"><a href="${l.url}">${l.label}</a></li>
                                         </#list>
                                     </ul>
                                 </div>

diff --git a/themes/src/main/resources/theme/base/login/template.ftl b/themes/src/main/resources/theme/base/login/template.ftl
index deed08d..855f40e 100755
--- a/themes/src/main/resources/theme/base/login/template.ftl
+++ b/themes/src/main/resources/theme/base/login/template.ftl
@@ -48,7 +48,7 @@
                             <a href="#" id="kc-current-locale-link">${locale.current}</a>
                             <ul>
                                 <#list locale.supported as l>
-                                    <li class="kc-dropdown-item"><a href="${l.url}" id="kc-locale-${l.label}">${l.label}</a></li>
+                                    <li class="kc-dropdown-item"><a href="${l.url}">${l.label}</a></li>
                                 </#list>
                             </ul>
                         </div>