diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php
index 636b1ba6e74..e8f2491d20c 100644
--- a/blocks/login/block_login.php
+++ b/blocks/login/block_login.php
@@ -115,7 +115,7 @@ class block_login extends block_base {
                 $this->content->text .= '<div class="potentialidplist">';
                 foreach ($potentialidps as $idp) {
                     $this->content->text .= '<div class="potentialidp">';
-                    $this->content->text .= '<a class="btn btn-secondary btn-block" ';
+                    $this->content->text .= '<a class="btn btn-default btn-block" ';
                     $this->content->text .= 'href="' . $idp['url']->out() . '" title="' . s($idp['name']) . '">';
                     if (!empty($idp['iconurl'])) {
                         $this->content->text .= '<img src="' . s($idp['iconurl']) . '" width="24" height="24" class="m-r-1"/>';
diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache
index 1d65ea1152d..a6c2cf35d48 100644
--- a/lib/templates/loginform.mustache
+++ b/lib/templates/loginform.mustache
@@ -123,21 +123,20 @@
 
     </div>
 
+    <div class="signuppanel">
     {{#hasinstructions}}
-        <div class="signuppanel">
-            <h2>{{#str}} firsttime {{/str}}</h2>
-            <div class="subcontent">
-                {{{instructions}}}
-                {{#cansignup}}
-                    <div class="signupform">
-                        <form action="{{signupurl}}" method="get" id="signup">
-                            <div>
-                                <input type="submit" value={{#quote}}{{#str}} startsignup {{/str}}{{/quote}} />
-                            </div>
-                        </form>
-                    </div>
-                {{/cansignup}}
-            </div>
+        <h2>{{#str}} firsttime {{/str}}</h2>
+        <div class="subcontent">
+            {{{instructions}}}
+            {{#cansignup}}
+                <div class="signupform">
+                    <form action="{{signupurl}}" method="get" id="signup">
+                        <div>
+                            <input type="submit" value={{#quote}}{{#str}} startsignup {{/str}}{{/quote}} />
+                        </div>
+                    </form>
+                </div>
+            {{/cansignup}}
         </div>
     {{/hasinstructions}}
 
@@ -147,17 +146,18 @@
             <div class="potentialidplist">
                 {{#identityproviders}}
                     <div class="potentialidp">
-                        <a href="{{url}}" title={{#quote}}{{name}}{{/quote}}>
-                            {{#iconurl}}
-                                <img src="{{iconurl}}" alt="" width="24" height="24"/>
-                            {{/iconurl}}
-                            {{name}}
+                        <a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn">
+                        {{#iconurl}}
+                            <img src="{{iconurl}}" alt="" width="24" height="24"/>
+                        {{/iconurl}}
+                        {{name}}
                         </a>
                     </div>
                 {{/identityproviders}}
             </div>
         </div>
     {{/hasidentityproviders}}
+    </div>
 </div>
 
 {{#js}}
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 6a60df6bdd0..2ee0b3499a4 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -505,24 +505,14 @@ a.skip:active {
     margin-bottom: 5px;
     margin-top: 15px;
 }
-.loginbox .signuppanel .subcontent {
-    text-align: left;
-}
 .loginbox .loginsub {
     margin-left: 0;
     margin-right: 0;
 }
 .loginbox .guestsub,
-.loginbox .forgotsub,
-.loginbox .potentialidps {
+.loginbox .forgotsub {
     margin: 5px 12%;
 }
-.loginbox .potentialidps .potentialidplist {
-    margin-left: 40%;
-}
-.loginbox .potentialidps .potentialidplist div {
-    text-align: left;
-}
 .loginbox .loginform {
     margin-top: 1em;
     text-align: left;
@@ -558,7 +548,9 @@ a.skip:active {
     margin-bottom: -2000px;
     padding-bottom: 2000px;
 }
-
+.loginbox .potentialidp {
+    margin-bottom: 0.3em;
+}
 .loginbox .potentialidp .smallicon {
     vertical-align: text-bottom;
     margin: 0 .3em;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 147abba0c0c..88cc4a8f369 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -2796,24 +2796,14 @@ a.skip:active {
   margin-bottom: 5px;
   margin-top: 15px;
 }
-.loginbox .signuppanel .subcontent {
-  text-align: left;
-}
 .loginbox .loginsub {
   margin-left: 0;
   margin-right: 0;
 }
 .loginbox .guestsub,
-.loginbox .forgotsub,
-.loginbox .potentialidps {
+.loginbox .forgotsub {
   margin: 5px 12%;
 }
-.loginbox .potentialidps .potentialidplist {
-  margin-left: 40%;
-}
-.loginbox .potentialidps .potentialidplist div {
-  text-align: left;
-}
 .loginbox .loginform {
   margin-top: 1em;
   text-align: left;
@@ -2851,6 +2841,9 @@ a.skip:active {
   margin-bottom: -2000px;
   padding-bottom: 2000px;
 }
+.loginbox .potentialidp {
+  margin-bottom: 0.3em;
+}
 .loginbox .potentialidp .smallicon {
   vertical-align: text-bottom;
   margin: 0 .3em;