diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py
index f7a1adf3..316732a8 100644
--- a/rhodecode/authentication/base.py
+++ b/rhodecode/authentication/base.py
@@ -215,9 +215,10 @@ class RhodeCodeAuthPluginBase(object):
         """
         return self._plugin_id
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         """
         Returns a translation string for displaying purposes.
+        if load_from_settings is set, plugin settings can override the display name
         """
         raise NotImplementedError('Not implemented in base class')
 
diff --git a/rhodecode/authentication/plugins/auth_crowd.py b/rhodecode/authentication/plugins/auth_crowd.py
index 0817db4e..a61a6e1c 100644
--- a/rhodecode/authentication/plugins/auth_crowd.py
+++ b/rhodecode/authentication/plugins/auth_crowd.py
@@ -213,7 +213,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
     def get_settings_schema(self):
         return CrowdSettingsSchema()
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('CROWD')
 
     @classmethod
diff --git a/rhodecode/authentication/plugins/auth_headers.py b/rhodecode/authentication/plugins/auth_headers.py
index a331af40..9ab65842 100644
--- a/rhodecode/authentication/plugins/auth_headers.py
+++ b/rhodecode/authentication/plugins/auth_headers.py
@@ -95,7 +95,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
             route_name='auth_home',
             context=HeadersAuthnResource)
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('Headers')
 
     def get_settings_schema(self):
diff --git a/rhodecode/authentication/plugins/auth_jasig_cas.py b/rhodecode/authentication/plugins/auth_jasig_cas.py
index 088d868b..2531a9cf 100644
--- a/rhodecode/authentication/plugins/auth_jasig_cas.py
+++ b/rhodecode/authentication/plugins/auth_jasig_cas.py
@@ -89,7 +89,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
     def get_settings_schema(self):
         return JasigCasSettingsSchema()
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('Jasig-CAS')
 
     @hybrid_property
diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py
index c7d20854..cf0080bf 100644
--- a/rhodecode/authentication/plugins/auth_ldap.py
+++ b/rhodecode/authentication/plugins/auth_ldap.py
@@ -421,7 +421,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
     def get_settings_schema(self):
         return LdapSettingsSchema()
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('LDAP')
 
     @classmethod
diff --git a/rhodecode/authentication/plugins/auth_pam.py b/rhodecode/authentication/plugins/auth_pam.py
index cdff1512..6ad47208 100644
--- a/rhodecode/authentication/plugins/auth_pam.py
+++ b/rhodecode/authentication/plugins/auth_pam.py
@@ -95,7 +95,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
             route_name='auth_home',
             context=PamAuthnResource)
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('PAM')
 
     @classmethod
diff --git a/rhodecode/authentication/plugins/auth_rhodecode.py b/rhodecode/authentication/plugins/auth_rhodecode.py
index c2aeb72e..8e5128cb 100644
--- a/rhodecode/authentication/plugins/auth_rhodecode.py
+++ b/rhodecode/authentication/plugins/auth_rhodecode.py
@@ -75,7 +75,7 @@ class RhodeCodeAuthPlugin(RhodeCodeAuthPluginBase):
     def get_settings_schema(self):
         return RhodeCodeSettingsSchema()
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('RhodeCode Internal')
 
     @classmethod
diff --git a/rhodecode/authentication/plugins/auth_token.py b/rhodecode/authentication/plugins/auth_token.py
index 42f7ff72..d3387b3c 100644
--- a/rhodecode/authentication/plugins/auth_token.py
+++ b/rhodecode/authentication/plugins/auth_token.py
@@ -73,7 +73,7 @@ class RhodeCodeAuthPlugin(RhodeCodeAuthPluginBase):
     def get_settings_schema(self):
         return RhodeCodeSettingsSchema()
 
-    def get_display_name(self):
+    def get_display_name(self, load_from_settings=False):
         return _('Rhodecode Token')
 
     @classmethod
diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako
index 8f5b141e..8d56c7be 100644
--- a/rhodecode/templates/login.mako
+++ b/rhodecode/templates/login.mako
@@ -32,8 +32,8 @@
             <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
 
-        <%block name="above_login_button" />
         <div id="login" class="right-column">
+            <%block name="above_login_button" />
             <!-- login -->
             <div class="sign-in-title">
                 <h1>${_('Sign In using username/password')}</h1>