diff --git a/webroot/includes/modal-login.tpl.html b/webroot/includes/modal-login.tpl.html
index 7e0fe92..4ba32e2 100644
--- a/webroot/includes/modal-login.tpl.html
+++ b/webroot/includes/modal-login.tpl.html
@@ -5,15 +5,16 @@
             <div class="modal-header">
                 <h5 class="modal-title" id="loginModalLabel">Login</h5>
             </div>
-            <div class="modal-body">
-                <div class="container-fluid">
+            <form action="/api/auth/login" onsubmit="submitLoginForm(this,event)">
+                <div class="modal-body">
+                    <div class="container-fluid">
+
+                        <div class="alert alert-danger d-none align-items-center" role="alert" id="login-form-error">
+                            <img src={{ trima_img "ja/btn_stop.gif" "url" }} style="height: 4em" class="d-block">
+                            <hr>
+                            <span>An error occured.</span>
+                        </div>
 
-                    <div class="alert alert-danger d-none align-items-center" role="alert" id="login-form-error">
-                        <img src={{ trima_img "ja/btn_stop.gif" "url" }} style="height: 4em" class="d-block">
-                        <hr>
-                        <span>An error occured.</span>
-                    </div>
-                    <form action="/api/auth/login" onsubmit="submitLoginForm(this,event)">
                         <div class="mb-3">
                             <div class="mb-2">
                                 <label for="username">Username</label>
@@ -29,17 +30,15 @@
                             <label for="otp_response">OTP Response (Optional)</label>
                             <input type="text" class="form-control" name="otp_response" placeholder="OTP Response">
                         </div>
-                    </form>
+
+                    </div>
                 </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" onclick="history.back()"
-                    data-bs-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-primary" onclick="
-                        let form = $('#login-modal form');
-                        form.submit();
-                    ">Submit</button>
-            </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" onclick="history.back()"
+                        data-bs-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Submit</button>
+                </div>
+            </form>
         </div>
     </div>
 </div>