diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 34ba5e1c2..f9b602460 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -55,14 +55,15 @@
         </md-input-container>
 
 	<label><var:string label:value="Language:"/>
-	<var:popup const:name="language"
-                   const:data-ng-model="creds.language"
-		   list="languages"
-		   item="item"
-		   var:value="item"
-		   string="languageText"
-		   label:noSelectionString="choose"
-		   />
+
+        <md-select ng-model="creds.language" label:placeholder="choose">
+          <var:foreach list="languages" item="item">
+            <md-option var:value="item">
+              <var:string value="languageText"/>
+            </md-option>
+          </var:foreach>
+        </md-select>
+
         </label>
         <var:if condition="hasLoginDomains">
 	  <label><var:string label:value="Domain:"/><br/>