diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html
index c94fa0416..144113406 100644
--- a/src/main/resources/templates/addUsers.html
+++ b/src/main/resources/templates/addUsers.html
@@ -89,10 +89,10 @@
                       <td style="align-content: center;">
                         <form th:action="@{'/api/v1/user/admin/changeUserEnabled/' + ${user.username}}" method="post" onsubmit="return confirmChangeUserStatus()">
                           <input type="hidden" name="enabled" th:value="!${user.enabled}" />
-                          <button th:if="${user.enabled}" th:title="#{adminUserSettings.enabledUser}" type="submit" class="btn btn-success btn-sm">
+                          <button type="submit" th:if="${user.enabled}" th:title="#{adminUserSettings.enabledUser}" class="btn btn-success btn-sm">
                             <span class="material-symbols-rounded">person</span>
                           </button>
-                          <button th:unless="${user.enabled}" th:title="#{adminUserSettings.disabledUser}" type="submit" class="btn btn-danger btn-sm">
+                          <button type="submit" th:unless="${user.enabled}" th:title="#{adminUserSettings.disabledUser}" class="btn btn-danger btn-sm">
                             <span class="material-symbols-rounded">person_off</span>
                           </button>
                         </form>
diff --git a/src/main/resources/templates/convert/pdf-to-csv.html b/src/main/resources/templates/convert/pdf-to-csv.html
index 8bf2b7a3b..b9e27b72c 100644
--- a/src/main/resources/templates/convert/pdf-to-csv.html
+++ b/src/main/resources/templates/convert/pdf-to-csv.html
@@ -19,7 +19,7 @@
               <form id="PDFToCSVForm" th:action="@{'/api/v1/convert/pdf/csv'}" method="post" enctype="multipart/form-data">
                 <input  id="pageId" type="hidden" name="pageId">
                 <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
-                <button type="submit" class="btn btn-primary" th:text="#{PDFToCSV.submit}" id="submitBtn"></button>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToCSV.submit}"></button>
               </form>
               <p id="instruction-text" style="margin: 0; display: none" th:text="#{PDFToCSV.prompt}"></p>
 
diff --git a/src/main/resources/templates/crop.html b/src/main/resources/templates/crop.html
index 5262f0f59..0617bf9b6 100644
--- a/src/main/resources/templates/crop.html
+++ b/src/main/resources/templates/crop.html
@@ -22,7 +22,7 @@
                 <input id="y" type="hidden" name="y">
                 <input id="width" type="hidden" name="width">
                 <input id="height" type="hidden" name="height">
-                <button id="submitBtn" type="submit" class="btn btn-primary" th:text="#{crop.submit}"></button>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{crop.submit}"></button>
               </form>
               <div id="canvasesContainer" style="position: relative; margin: 20px 0; width: auto;">
                 <canvas id="cropPdfCanvas" style="width: 100%"></canvas>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 56485aeaf..e4a5e3dda 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -93,7 +93,7 @@
             <input type="checkbox" name="remember-me" id="remember-me">
             <label for="remember-me" th:text="#{login.rememberme}"></label>
           </div>
-          <button class="w-100 btn btn-lg btn-primary" type="submit" th:text="#{login.signin}">Sign in</button>
+          <button type="submit" class="w-100 btn btn-lg btn-primary" th:text="#{login.signin}">Sign in</button>
         </form>
         <div class="mt-3"> <!-- Added a margin-top for spacing -->
           <div class="dropdown text-center">
diff --git a/src/main/resources/templates/misc/change-metadata.html b/src/main/resources/templates/misc/change-metadata.html
index 2aaa47e9a..524fde9c8 100644
--- a/src/main/resources/templates/misc/change-metadata.html
+++ b/src/main/resources/templates/misc/change-metadata.html
@@ -83,7 +83,7 @@
                 <button type="button" class="btn btn-secondary" id="addMetadataBtn" th:text="#{changeMetadata.selectText.5}"></button>
                 <br>
                 <br>
-                <button class="btn btn-primary" type="submit" id="submitBtn" th:text="#{changeMetadata.submit}"></button>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{changeMetadata.submit}"></button>
                 <script type="module" th:src="@{'/pdfjs-legacy/pdf.mjs'}"></script>
                 <script type="module" th:src="@{'/js/pages/change-metadata.js'}">
                 </script>
diff --git a/src/main/resources/templates/remove-image-pdf.html b/src/main/resources/templates/remove-image-pdf.html
index 0d395474f..5b64081f1 100644
--- a/src/main/resources/templates/remove-image-pdf.html
+++ b/src/main/resources/templates/remove-image-pdf.html
@@ -2,8 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
       xmlns:th="https://www.thymeleaf.org">
 <head>
-    <th:block
-            th:insert="~{fragments/common :: head(title=#{removeImage.title}, header=#{removeImage.header})}"></th:block>
+    <th:block th:insert="~{fragments/common :: head(title=#{removeImage.title}, header=#{removeImage.header})}"></th:block>
     <link rel="stylesheet" th:href="@{'/css/removeImage.css'}">
 </head>
 
@@ -20,7 +19,7 @@
                         <span class="material-symbols-rounded tool-header-icon word">remove_selection</span>
                         <span class="tool-header-text" th:text="#{removeImage.header}"></span>
                     </div>
-                        <form th:action="@{'api/v1/general/remove-image-pdf'}" method="post" enctype="multipart/form-data">
+                    <form th:action="@{'api/v1/general/remove-image-pdf'}" method="post" enctype="multipart/form-data">
                         <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
 
                         <br>
diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html
index 4b59aa61e..950985b0a 100644
--- a/src/main/resources/templates/security/add-watermark.html
+++ b/src/main/resources/templates/security/add-watermark.html
@@ -131,7 +131,7 @@
                             <label for="convertPDFToImage" th:text="#{watermark.selectText.10}"></label>
                         </div>
                         <div class="mb-3 text-left">
-                            <input type="submit" id="submitBtn" th:value="#{watermark.submit}" class="btn btn-primary">
+                            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{watermark.submit}"></button>
                         </div>
                     </form>
 
diff --git a/src/main/resources/templates/security/auto-redact.html b/src/main/resources/templates/security/auto-redact.html
index 6754a8abc..7a4bcc5dd 100644
--- a/src/main/resources/templates/security/auto-redact.html
+++ b/src/main/resources/templates/security/auto-redact.html
@@ -74,7 +74,7 @@
                   <label for="convertPDFToImage" th:text="#{autoRedact.convertPDFToImageLabel}"></label>
                 </div>
 
-                <button type="submit" class="btn btn-primary" th:text="#{autoRedact.submitButton}"></button>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{autoRedact.submitButton}"></button>
               </form>
             </div>
           </div>
diff --git a/src/main/resources/templates/security/remove-watermark.html b/src/main/resources/templates/security/remove-watermark.html
index e507bb51e..a13c41a15 100644
--- a/src/main/resources/templates/security/remove-watermark.html
+++ b/src/main/resources/templates/security/remove-watermark.html
@@ -26,7 +26,7 @@
                   <input type="text" id="watermarkText" name="watermarkText" class="form-control" placeholder="Stirling-PDF" required />
                 </div>
                 <div class="mb-3 text-center">
-                  <input type="submit" id="submitBtn" th:value="#{remove-watermark.submit}" class="btn btn-primary" />
+                  <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{remove-watermark.submit}"></button>
                 </div>
               </form>
             </div>