diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
index c1e718dd61..58a4ff0c69 100644
--- a/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
@@ -183,7 +183,8 @@ public boolean isLanguageNameValid() {
 
     @Override
     public List<HLocale> suggest() {
-        if (StringUtils.isEmpty(getQuery())) {
+        language = getQuery();
+        if (StringUtils.isEmpty(language) || !isLanguageNameValid()) {
             return Collections.EMPTY_LIST;
         }
 
@@ -204,12 +205,12 @@ public HLocale apply(@Nullable LocaleId from) {
                     @Override
                     public boolean apply(HLocale input) {
                         return StringUtils.startsWithIgnoreCase(input
-                                .getLocaleId().getId(), getQuery());
+                                .getLocaleId().getId(), language);
                     }
                 });
         if(filtered.isEmpty()) {
-            language = getQuery();
-            filtered = Lists.newArrayList(new HLocale(new LocaleId(language)));
+            filtered =
+                    Lists.newArrayList(new HLocale(new LocaleId(language)));
             updateLanguage();
         }
         return Lists.newArrayList(filtered);
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
index c8c2a937f9..5ded024bef 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
@@ -25,7 +25,8 @@
               <li>
                 <a4j:commandLink id="Join" action="#{languageTeamAction.joinTribe}"
                   styleClass="i__item--right"
-                  render="memberPanel, more-action-form" value=" #{msgs['jsf.JoinLanguageTeam']}">
+                  render="memberPanel, more-action-form, members-count"
+                  value=" #{msgs['jsf.JoinLanguageTeam']}">
                   <i class="i i--plus i__item__icon"></i>
                   <s:conversationId name="id" value="#{languageTeamAction.language}"/>
                 </a4j:commandLink>
@@ -36,7 +37,8 @@
               <li>
                 <a4j:commandLink id="Leave" styleClass="txt--danger i__item--right"
                   action="#{languageTeamAction.leaveTribe}"
-                  render="memberPanel, more-action-form" value="#{msgs['jsf.LeaveLanguageTeam']}">
+                  render="memberPanel, more-action-form, members-count"
+                  value="#{msgs['jsf.LeaveLanguageTeam']}">
                   <i class="i i--remove i__item__icon"></i>
                   <s:conversationId name="id" value="#{languageTeamAction.language}"/>
                 </a4j:commandLink>
@@ -112,12 +114,12 @@
               </a>
               <ul class="dropdown__content js-dropdown__content">
                 <li>
-                  <h:commandLink value="#{msgs['jsf.Remove']}"
+                  <a4j:commandLink value="#{msgs['jsf.Remove']}"
                     action="#{languageTeamAction.removeMembership(member)}"
                     render="memberPanel, more-action-form, userAddPanel, members-count" execute="@this"
                     styleClass="i__item--right txt--danger">
                     <i class="i i--remove i__item__icon"></i>
-                  </h:commandLink>
+                  </a4j:commandLink>
                 </li>
               </ul>
             </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
index af1c917bce..c19667f30d 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
@@ -22,8 +22,8 @@
     action="#{languageTeamAction.clearSearchResult}" render="searchResults"/>
 
   <a4j:jsFunction name="addSelected"
-    action="#{languageTeamAction.addSelected}" render="searchResults, memberPanel"
-    oncomplete="jQuery('#cancel').click();"/>
+    action="#{languageTeamAction.addSelected}" render="searchResults, memberPanel, members-count"
+    oncomplete="jQuery('#cancel').click();zanata.modal.hide('#searchUserDialog')"/>
 
   <div class="modal__dialog l--constrain-medium">
     <header class="modal__header">
diff --git a/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml b/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
index f5a7dcaecd..94a0217331 100644
--- a/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
@@ -11,6 +11,34 @@
 
   <ui:define
     name="page_title">#{msgs['jsf.CreateSupportedLanguage']}</ui:define>
+
+  <ui:define name="head">
+    <script type="text/javascript">
+      function replaceUnderscores() {
+        var input = jQuery("#localeAutocomplete-autocomplete__input");
+        var langName = jQuery(input).val();
+        langName = langName.replace('_', '-');
+        jQuery(input).val(langName);
+        setLanguage(langName);
+        validateLangName();
+      }
+
+    </script>
+
+    <style type="text/css">
+      .checkbox label {
+        padding-right:0.40625em;
+      }
+
+      .checkbox input[type=checkbox] {
+        width: 1em;
+        height: 1em;
+        vertical-align: middle;
+        margin-bottom: 0.20625em;
+      }
+    </style>
+
+  </ui:define>
   <ui:define name="center_content">
     <div class="g--centered">
       <div class="g__item w--3-4-m w--5-8-l w--1-3 l--push-bottom-1">
@@ -27,31 +55,14 @@
         <h1 class="l--push-all-0">#{msgs['jsf.CreateSupportedLanguage']}</h1>
 
         <h:form id="addLanguageForm">
-          <script type="text/javascript">
-            function replaceUnderscores() {
-              var langName = #{rich:element('localeName')}.value;
-              langName = langName.replace('_', '-');
-              #{rich:element('localeName')}.value = langName;
-              validateLangName();
-            }
-          </script>
-
-          <style type="text/css">
-            .checkbox label {
-              padding-right:0.40625em;
-            }
-
-            .checkbox input[type=checkbox] {
-              width: 1em;
-              height: 1em;
-              vertical-align: middle;
-              margin-bottom: 0.20625em;
-            }
-          </style>
 
           <a4j:jsFunction name="validateLangName"
             action="#{languageManagerAction.updateLanguage()}"
-            render="output,localeNameMssgs"/>
+            render="output,localeNameMsgs"/>
+
+          <a4j:jsFunction name="setLanguage">
+            <a4j:param name="val1" assignTo="#{languageManagerAction.language}"/>
+          </a4j:jsFunction>
 
           <div class="form__item l--push-top-1">
             <label
@@ -65,13 +76,14 @@
               minlength="1"
               fetchValue="#{result.localeId}"
               displayText="#{result.localeId}"
-              render="output,localeNameMssgs"
+              render="output,localeNameMsgs"
+              onRenderResultComplete="validateLangName()"
               placeholder="#{msgs['jsf.language.search.placeholder']}">
               #{result.localeId}<span
               class="txt--understated l--push-left-quarter">#{result.retrieveDisplayName()}</span>
             </zanata:autocomplete>
 
-            <s:div id="localeNameMssgs">
+            <s:div id="localeNameMsgs" styleClass="txt--warning">
               <h:outputText
                 value="#{languageManagerAction.languageNameValidationMessage}"
                 rendered="#{not languageManagerAction.language.contains('_')}"
diff --git a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
index 7beb7314a3..d594efdb04 100644
--- a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
@@ -43,6 +43,9 @@
   <composite:attribute name="oncomplete"
     shortDescription="The client-side script method to be called after the DOM is updated"/>
 
+  <composite:attribute name="onRenderResultComplete"
+    shortDescription="The client-side script method to be called after suggestions results"/>
+
   <composite:attribute name="inputClass"
     shortDescription="CSS class for input field"/>
 
@@ -62,7 +65,8 @@
     render="#{cc.attrs.id}-result"
     limitRender="true"
     onbegin="#{cc.attrs.id}ShowLoader()"
-    oncomplete="#{cc.attrs.id}HideLoader(); registerMouseEvent('#{cc.attrs.id}', #{cc.attrs.id}SubmitSelected, #{cc.attrs.onSelectItem})">
+    oncomplete="#{cc.attrs.id}HideLoader(); #{cc.attrs.onRenderResultComplete};
+    registerMouseEvent('#{cc.attrs.id}', #{cc.attrs.id}SubmitSelected, #{cc.attrs.onSelectItem})">
     <a4j:param name="val" assignTo="#{cc.attrs.actionBean.query}"/>
   </a4j:jsFunction>