diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index b60c696d56..fbab4ec2c9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -385,11 +385,13 @@
                         [% UNLESS Koha.Preference('opacShibOnly') %]
                             <input type="hidden" name="koha_login_context" value="opac" />
                             <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>
+                                <div class="local-login">
+                                    <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>
+                                </div>
                                 [% IF OpacLoginInstructions %]
                                     <div id="nologininstructions-modal" class="nologininstructions">
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
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 0fd0d32bba..62a8ee03ed 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -190,23 +190,25 @@
                             [% END %]
                                 <input type="hidden" name="koha_login_context" value="opac" />
 
-                                <fieldset class="brief">
-                                    [% FOREACH INPUT IN INPUTS %]
-                                        [% NEXT IF INPUT.name == 'logout.x' %]
-                                        <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
-                                    [% END %]
-                                    <div class="form-group">
-                                        <label for="userid">Login:</label>
-                                        <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="password">Password:</label>
-                                        <input class="form-control" type="password"  size="25" id="password"  name="password" />
-                                    </div>
-                                    <fieldset class="action">
-                                        <input type="submit" value="Log in" class="btn btn-primary" />
+                                <div class="local-login">
+                                    <fieldset class="brief">
+                                        [% FOREACH INPUT IN INPUTS %]
+                                            [% NEXT IF INPUT.name == 'logout.x' %]
+                                            <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
+                                        [% END %]
+                                        <div class="form-group">
+                                            <label for="userid">Login:</label>
+                                            <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="password">Password:</label>
+                                            <input class="form-control" type="password"  size="25" id="password"  name="password" />
+                                        </div>
+                                        <fieldset class="action">
+                                            <input type="submit" value="Log in" class="btn btn-primary" />
+                                        </fieldset>
                                     </fieldset>
-                                </fieldset>
+                                </div>
 
                                 <div id="nologininstructions">
                                     [% IF OpacLoginInstructions %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 76fa790f8f..8850ee7927 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -189,13 +189,15 @@
                                             <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa fa-google" aria-hidden="true"></i> Log in with Google</a>
                                             <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
                                         [% END # /IF GoogleOpenIDConnect %]
-                                        <label for="userid">Login:</label>
-                                        <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
-                                        <label for="password">Password:</label>
-                                        <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
-                                        <fieldset class="action">
-                                            <input type="submit" value="Log in" class="btn btn-primary" />
-                                        </fieldset>
+                                        <div class="local-login">
+                                            <label for="userid">Login:</label>
+                                            <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
+                                            <label for="password">Password:</label>
+                                            <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
+                                            <fieldset class="action">
+                                                <input type="submit" value="Log in" class="btn btn-primary" />
+                                            </fieldset>
+                                        </div>
                                         [% IF ( OpacLoginInstructions ) %]
                                             <div id="nologininstructions-main" class="nologininstructions">
                                                 [% PROCESS koha_news_block news => OpacLoginInstructions %]