diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index c2cf93a090..cf702e45aa 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -394,6 +394,9 @@
                             <fieldset class="brief">
                                 <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" autocomplete="off" />
                                 <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
+                                <fieldset class="action">
+                                    <input type="submit" class="btn btn-primary" value="Log in" />
+                                </fieldset>
                                 [% IF OpacLoginInstructions %]
                                     <div id="nologininstructions-modal" class="nologininstructions">
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
@@ -412,11 +415,6 @@
                             </fieldset>
                         [% END %]
                     </div>
-                    [% UNLESS Koha.Preference('opacShibOnly') %]
-                        <div class="modal-footer">
-                            <input type="submit" class="btn btn-primary" value="Log in" />
-                        </div>
-                    [% END %]
                 </form> <!-- /#auth -->
             </div> <!-- /.modal-content -->
         </div> <!-- /.modal-dialog -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index 68b2cdad78..4bbc55e304 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -195,11 +195,6 @@
                                     </fieldset>
                                 </fieldset>
 
-                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
-                                    <div id="forgotpassword">
-                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
-                                    </div>
-                                [% END %]
                                 <div id="nologininstructions">
                                     [% IF OpacLoginInstructions %]
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
@@ -209,13 +204,19 @@
                                         <h2>Don't have a library card?</h2>
                                         <p>If you don't have a library card, stop by your local library to sign up.</p>
                                     [% END # / IF OpacLoginInstructions %]
-
-                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
-                                        <span id="registrationinstructions">
+                                </div>
+                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
+                                    <div id="forgotpassword">
+                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
+                                    </div>
+                                [% END %]
+                                [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
+                                    <div id="registrationinstructions">
+                                        <span>
                                             <a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a>
                                         </span>
-                                    [% END %]
-                                </div>
+                                    </div>
+                                [% END %]
                             </form>
                         [% END # / IF !OPACShibOnly or SCO_login or SCI_login %]
                     [% END # / IF loginprompt %]