From 8df8576b0c3c42baac85f9f3c32592fd9e973edb Mon Sep 17 00:00:00 2001
From: Lee Peuker <lee.peuker@protonmail.com>
Date: Tue, 11 Apr 2023 19:51:15 +0200
Subject: [PATCH] Minor improvments

---
 public/js/settings-users.js              | 6 ++++++
 templates/component/modal-user.html.twig | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/js/settings-users.js b/public/js/settings-users.js
index 67a13c12..2d194e1f 100644
--- a/public/js/settings-users.js
+++ b/public/js/settings-users.js
@@ -44,6 +44,9 @@ function prepareCreateUserModal(name) {
     document.getElementById('userModalPasswordInput').value = ''
     document.getElementById('userModalRepeatPasswordInput').value = ''
     document.getElementById('userModalIsAdminInput').checked = ''
+
+    // Remove class invalid-input from all (input) elements
+    Array.from(document.querySelectorAll('.invalid-input')).forEach((el) => el.classList.remove('invalid-input'));
 }
 
 function prepareEditUserModal(id, name, email, isAdmin, password, repeatPassword) {
@@ -63,6 +66,9 @@ function prepareEditUserModal(id, name, email, isAdmin, password, repeatPassword
     document.getElementById('userModalIsAdminInput').checked = isAdmin
     document.getElementById('userModalPasswordInput').value = ''
     document.getElementById('userModalRepeatPasswordInput').value = ''
+
+    // Remove class invalid-input from all (input) elements
+    Array.from(document.querySelectorAll('.invalid-input')).forEach((el) => el.classList.remove('invalid-input'));
 }
 
 function validateCreateUserInput() {
diff --git a/templates/component/modal-user.html.twig b/templates/component/modal-user.html.twig
index 455ab6e6..cc1fb0d2 100644
--- a/templates/component/modal-user.html.twig
+++ b/templates/component/modal-user.html.twig
@@ -22,12 +22,12 @@
                     <div class="mb-3">
                         <label for="userModalPasswordInput" class="form-label">Password <span class="text-danger" id="userModalPasswordInputRequiredStar">*</span></label>
                         <input type="password" class="form-control" id="userModalPasswordInput" minlength="8" required>
-                        <div id="userModalPasswordInput" class="form-text">Must be at least 8 characters long and match repeated</div>
+                        <div id="userModalPasswordInput" class="form-text">Must be at least 8 characters long</div>
                     </div>
                     <div class="mb-3">
                         <label for="userModalRepeatPasswordInput" class="form-label">Repeat Password <span class="text-danger" id="userModalRepeatPasswordInputRequiredStar">*</span></label>
                         <input type="password" class="form-control" id="userModalRepeatPasswordInput" minlength="8" required>
-                        <div id="userModalRepeatPasswordInput" class="form-text">Must be at least 8 characters long and match repeated</div>
+                        <div id="userModalRepeatPasswordInput" class="form-text">Must match entered password</div>
                     </div>
                     <div class="mb-3">
                         <div class="form-check">