diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako
--- a/rhodecode/templates/register.mako
+++ b/rhodecode/templates/register.mako
@@ -32,7 +32,12 @@
         <div id="register" class="right-column">
             <!-- login -->
             <div class="sign-in-title">
-                <h1>${_('Create an account')}</h1>
+                % if social_auth_provider:
+                    <h1>${_('Create an account linked with {}').format(social_auth_provider)}</h1>
+                % else:
+                    <h1>${_('Create an account')}</h1>
+                % endif
+
                 <h4>${h.link_to(_("Go to the login page to sign in with an existing account."), request.route_path('login'))}</h4>
             </div>
             <div class="inner form">
@@ -45,6 +50,11 @@
                       <br />
                     %endif
 
+                    % if social_auth_provider:
+                        ## hide password prompts for social auth
+                        <div style="display: none">
+                    % endif
+
                     <label for="password">${_('Password')}:</label>
                     ${h.password('password', defaults.get('password'))}
                     %if 'password' in errors:
@@ -59,6 +69,11 @@
                       <br />
                     %endif
 
+                    % if social_auth_provider:
+                        ## hide password prompts for social auth
+                        </div>
+                    % endif
+
                     <label for="firstname">${_('First Name')}:</label>
                     ${h.text('firstname', defaults.get('firstname'))}
                     %if 'firstname' in errors: