diff --git a/rhodecode/authentication/routes.py b/rhodecode/authentication/routes.py
--- a/rhodecode/authentication/routes.py
+++ b/rhodecode/authentication/routes.py
@@ -88,15 +88,15 @@ class AuthnRootResource(AuthnResourceBas
         # TODO: Store this info in the resource element.
         return self._resource_name_map[resource_name]
 
-    def get_sorted_list(self):
+    def get_sorted_list(self, sort_key=None):
         """
         Returns a sorted list of sub resources for displaying purposes.
         """
-        def sort_key(resource):
+        def default_sort_key(resource):
             return str.lower(safe_str(resource.display_name))
 
         active = [item for item in self]
-        return sorted(active, key=sort_key)
+        return sorted(active, key=sort_key or default_sort_key)
 
     def get_nav_list(self, sort=True):
         """
diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less
--- a/rhodecode/public/css/buttons.less
+++ b/rhodecode/public/css/buttons.less
@@ -254,7 +254,7 @@ input[type="button"] {
 .btn-social {
     &:extend(.btn-default);
     margin: 5px 5px 5px 0px;
-    min-width: 150px;
+    min-width: 160px;
 }
 
 // TODO: johbo: check these exceptions
diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -29,7 +29,7 @@
 
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
-          % for item in resource.get_root().get_nav_list(sort=False):
+          % for item in resource.get_root().get_nav_list():
             <li ${'class=active' if item == resource else ''}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako
--- a/rhodecode/templates/register.mako
+++ b/rhodecode/templates/register.mako
@@ -32,8 +32,8 @@
         <div id="register" class="right-column">
             <!-- login -->
             <div class="sign-in-title">
-                % if social_auth_provider:
-                    <h1>${_('Create an account linked with {}').format(social_auth_provider)}</h1>
+                % if external_auth_provider:
+                    <h1>${_('Create an account linked with {}').format(external_auth_provider)}</h1>
                 % else:
                     <h1>${_('Create an account')}</h1>
                 % endif
@@ -50,7 +50,9 @@
                       <br />
                     %endif
 
-                    % if social_auth_provider:
+                    % if external_auth_provider:
+                        ## store internal marker about external identity
+                        ${h.hidden('external_identity', external_auth_provider)}
                         ## hide password prompts for social auth
                         <div style="display: none">
                     % endif
@@ -69,7 +71,7 @@
                       <br />
                     %endif
 
-                    % if social_auth_provider:
+                    % if external_auth_provider:
                         ## hide password prompts for social auth
                         </div>
                     % endif
diff --git a/rhodecode/tests/auth_external_test.py b/rhodecode/tests/auth_external_test.py
--- a/rhodecode/tests/auth_external_test.py
+++ b/rhodecode/tests/auth_external_test.py
@@ -45,7 +45,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExter
 
     @hybrid_property
     def name(self):
-        return "external_test"
+        return u"external_test"
 
     def settings(self):
         settings = [
diff --git a/rhodecode/tests/lib/auth_modules/test_auth_modules.py b/rhodecode/tests/lib/auth_modules/test_auth_modules.py
--- a/rhodecode/tests/lib/auth_modules/test_auth_modules.py
+++ b/rhodecode/tests/lib/auth_modules/test_auth_modules.py
@@ -30,7 +30,7 @@ from rhodecode.model import db
 class RcTestAuthPlugin(RhodeCodeAuthPluginBase):
 
     def name(self):
-        return 'stub_auth'
+        return u'stub_auth'
 
 
 def test_authenticate_returns_from_auth(stub_auth_data):