diff --git a/application/src/main/resources/templates/setup.html b/application/src/main/resources/templates/setup.html
index a8cec96a25..8ea7b88b5e 100644
--- a/application/src/main/resources/templates/setup.html
+++ b/application/src/main/resources/templates/setup.html
@@ -90,5 +90,23 @@ <h1 class="form-title" th:text="#{title}"></h1>
 
             <div th:replace="~{gateway_modules/common_fragments::languageSwitcher}"></div>
         </div>
+
+        <script th:inline="javascript">
+            document.addEventListener("DOMContentLoaded", function () {
+                var password = document.getElementById("password"),
+                    confirm_password = document.getElementById("confirmPassword");
+
+                function validatePassword() {
+                    if (password.value != confirm_password.value) {
+                        confirm_password.setCustomValidity("Passwords Don't Match");
+                    } else {
+                        confirm_password.setCustomValidity("");
+                    }
+                }
+
+                password.onchange = validatePassword;
+                confirm_password.onkeyup = validatePassword;
+            });
+        </script>
     </th:block>
 </html>