diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache
index d563f5a43ad..7b8caddcb52 100644
--- a/lib/templates/loginform.mustache
+++ b/lib/templates/loginform.mustache
@@ -180,7 +180,7 @@
             <input type="hidden" name="logintoken" value="{{logintoken}}">
             <input type="hidden" name="username" value="guest" />
             <input type="hidden" name="password" value="guest" />
-            <button class="btn btn-secondary" type="submit">{{#str}}loginguest{{/str}}</button>
+            <button class="btn btn-secondary" type="submit" id="loginguestbtn">{{#str}}loginguest{{/str}}</button>
         </form>
     {{/canloginasguest}}
     <div class="login-divider"></div>
@@ -213,4 +213,8 @@
     {{#error}}
         document.getElementById('loginerrormessage').focus();
     {{/error}}
+    require(['core_form/submit'], function(Submit) {
+        Submit.init("loginbtn");
+        Submit.init("loginguestbtn");
+    });
 {{/js}}