diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 24d2113..427e598 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -84,6 +84,7 @@
 - (BOOL) SAML2LogoutEnabled;
 
 - (BOOL) enablePublicAccess;
+- (BOOL) displayMailDomainsInDropDown;
 
 @end
 
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 31f96f0..44aa1ba 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -480,4 +480,9 @@ _injectConfigurationFromFile (NSUserDefaults *ud,
   return [self boolForKey: @"SOGoEnablePublicAccess"];
 }
 
+- (BOOL) displayMailDomainsInLoginDropDown
+{
+  return [self boolForKey: @"SOGoDisplayMailDomainsInLoginDropDown"];
+}
+
 @end
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 50d1fba..9762cb6 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -497,6 +542,15 @@
   return item;
 }
 
+- (id) displayitem
+{
+  if ([[SOGoSystemDefaults sharedSystemDefaults] displayMailDomainsInLoginDropDown])
+      return [[SOGoDomainDefaults defaultsForDomain: item] mailDomain];
+  else
+     return item;
+}
+
+
 - (NSArray *) languages
 {
   return [[SOGoSystemDefaults sharedSystemDefaults] supportedLanguages];
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 85a4e1e..60fd42d 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -57,7 +57,7 @@
 		       item="item"
 		       var:selection="item"
 		       var:value="item"
-		       string="item"
+		       string="displayitem"
 		       /></label>
             </var:if>
 	    <label><input id="rememberLogin" type="checkbox" class="checkBox" var:checked="rememberLogin"/> <var:string label:value="Remember username"/></label>
