Bugfix: fixes API query, replaces password comparisons, fixes duplicate ids (#1415)

fixes API query, replaces password comparisons, fixes duplicate ids

src/main/resources/messages_ar_AR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=لا يمكن خفض دور المستخدم الحالي

src/main/resources/messages_bg_BG.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
 invalidUsernameMessage=Невалидно потребителско име, потребителското име може да съдържа само букви, цифри и следните специални знаци @._+- или трябва да е валиден имейл адрес.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Не може да се изтрие вписания в момента потребител.
 deleteUsernameExistsMessage=Потребителското име не съществува и не може да бъде изтрито.
 downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител

src/main/resources/messages_ca_CA.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=No es pot reduir la funció de l'usuari actual

src/main/resources/messages_cs_CZ.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Uživatel nenalezen.
 incorrectPasswordMessage=Současné heslo není správné.
 usernameExistsMessage=Nové uživatelské jméno již existuje.
 invalidUsernameMessage=Nesprávné uživatelské jméno, smí obsahovat pouze písmena, číslice a následující speciální znaky @._+- nebo musí být validní emailová adresa.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nelze smazat aktuální přihlášeného uživatele.
 deleteUsernameExistsMessage=Uživatelské jméno neexistuje a nelze ho smazat.
 downgradeCurrentUserMessage=Nelze snížit roli aktuálního uživatele.

src/main/resources/messages_de_DE.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Benutzer nicht gefunden.
 incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
 invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
+confirmPasswordErrorMessage=„Neues Passwort“ und „Neues Passwort bestätigen“ müssen übereinstimmen.
 deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden.
 deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
 downgradeCurrentUserMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden

src/main/resources/messages_el_GR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Ο χρήστης δεν βρέθηκε.
 incorrectPasswordMessage=Ο τρέχων κωδικός πρόσβασης είναι λανθασμένος.
 usernameExistsMessage=Το νέο όνομα χρήστη υπάρχει ήδη.
 invalidUsernameMessage=Μη έγκυρο όνομα χρήστη, όνομα χρήστη μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους ακόλουθους ειδικούς χαρακτήρες @._+- ή πρέπει να είναι έγκυρη διεύθυνση email.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Δεν είναι δυνατή η διαγραφή του τρέχοντος συνδεδεμένου χρήστη.
 deleteUsernameExistsMessage=Το όνομα χρήστη δεν υπάρχει και δεν μπορεί να διαγραφεί.
 downgradeCurrentUserMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη

src/main/resources/messages_en_GB.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role

src/main/resources/messages_en_US.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role

src/main/resources/messages_es_ES.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Usuario no encontrado.
 incorrectPasswordMessage=La contraseña actual no es correcta.
 usernameExistsMessage=El nuevo nombre de usuario está en uso.
 invalidUsernameMessage=Nombre de usuario no válido, el nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso.
 deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse.
 downgradeCurrentUserMessage=No se puede degradar el rol del usuario actual

src/main/resources/messages_eu_ES.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Ezin da uneko erabiltzailearen rola jaitsi

src/main/resources/messages_fr_FR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Utilisateur non trouvé.
 incorrectPasswordMessage=Le mot de passe actuel est incorrect.
 usernameExistsMessage=Le nouveau nom d’utilisateur existe déjà.
 invalidUsernameMessage=Nom d’utilisateur invalide, le nom d’utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Impossible de supprimer l’utilisateur actuellement connecté.
 deleteUsernameExistsMessage=Le nom d’utilisateur n’existe pas et ne peut pas être supprimé.
 downgradeCurrentUserMessage=Impossible de rétrograder le rôle de l'utilisateur actuel.

src/main/resources/messages_hi_IN.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता

src/main/resources/messages_hr_HR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Kriva zaporka.
 usernameExistsMessage=Korisničko ime već postoji
 invalidUsernameMessage=Nevažeće korisničko ime, korisničko ime može sadržavati samo slova, brojke i sljedeće posebne znakove @._+- ili mora biti važeća adresa e-pošte.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nije moguće izbrisati trenutno prijavljenog korisnika.
 deleteUsernameExistsMessage=Korisničko ime ne postoji i ne može se izbrisati.
 downgradeCurrentUserMessage=Nije moguće vratiti unazad ulogu trenutnog korisnika

src/main/resources/messages_hu_HU.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=A felhasználó nem található.
 incorrectPasswordMessage=A jelenlegi jelszó helytelen.
 usernameExistsMessage=Az új felhasználónév már létezik.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=A jelenlegi felhasználó szerepkörét nem lehet visszaminősíteni

src/main/resources/messages_id_ID.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Tidak dapat menurunkan peran pengguna saat ini

src/main/resources/messages_it_IT.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Utente non trovato.
 incorrectPasswordMessage=La password attuale non è corretta.
 usernameExistsMessage=Il nuovo nome utente esiste già.
 invalidUsernameMessage=Nome utente non valido, il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- o deve essere un indirizzo email valido.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
 deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente

src/main/resources/messages_ja_JP.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
 invalidUsernameMessage=ユーザー名が無効です。ユーザー名には文字、数字、およびそれに続く特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。
 deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。
 downgradeCurrentUserMessage=現在のユーザーの役割をダウングレードできません

src/main/resources/messages_ko_KR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
 invalidUsernameMessage=잘못된 사용자 이름입니다. 사용자 이름에는 문자, 숫자 및 다음 특수 문자(@._+-)만 포함할 수 있거나 유효한 이메일 주소여야 합니다.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=현재 로그인한 사용자를 삭제할 수 없습니다.
 deleteUsernameExistsMessage=사용자 이름이 존재하지 않으며 삭제할 수 없습니다.
 downgradeCurrentUserMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다

src/main/resources/messages_nl_NL.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Kan de rol van de huidige gebruiker niet downgraden

src/main/resources/messages_no_NB.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Bruker ikke funnet.
 incorrectPasswordMessage=Nåværende passord er feil.
 usernameExistsMessage=Det nye brukernavnet eksisterer allerede.
 invalidUsernameMessage=Ugyldig brukernavn, brukernavnet kan bare inneholde bokstaver, tall og følgende spesialtegn @._+- eller må være en gyldig e-postadresse.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Kan ikke slette den innloggede brukeren.
 deleteUsernameExistsMessage=Brukernavnet eksisterer ikke og kan ikke slettes.
 downgradeCurrentUserMessage=Kan ikke nedgradere den innloggede brukerens rolle.

src/main/resources/messages_pl_PL.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Nie można obniżyć roli bieżącego użytkownika

src/main/resources/messages_pt_BR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Não é possível fazer downgrade da função do usuário atual

src/main/resources/messages_pt_PT.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Utilizador inexistente.
 incorrectPasswordMessage=Senha incorreta.
 usernameExistsMessage=Esse utilizador já existe.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Não é possível fazer downgrade da função do utilizador atual

src/main/resources/messages_ro_RO.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Rolul utilizatorului curent nu poate fi retrogradat

src/main/resources/messages_ru_RU.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Пользователь не найден.
 incorrectPasswordMessage=Текущий пароль неверен.
 usernameExistsMessage=Новое имя пользователя уже существует.
 invalidUsernameMessage=Неверное имя пользователя. Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Невозможно удалить пользователя, вошедшего в систему.
 deleteUsernameExistsMessage=Имя пользователя не существует и не может быть удалено.
 downgradeCurrentUserMessage=Невозможно понизить роль текущего пользователя

src/main/resources/messages_sk_SK.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Používateľ nebol nájdený.
 incorrectPasswordMessage=Aktuálne heslo je nesprávne.
 usernameExistsMessage=Nové používateľské meno už existuje.
 invalidUsernameMessage=Neplatné používateľské meno, používateľské meno musí obsahovať len abecedné znaky a čísla.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nie je možné zmazať aktuálne prihláseného používateľa.
 deleteUsernameExistsMessage=Používateľské meno neexistuje a nemôže byť zmazané.
 downgradeCurrentUserMessage=Nie je možné znížiť rolu aktuálneho používateľa

src/main/resources/messages_sr_LATN_RS.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Nije moguće degradirati ulogu trenutnog korisnika

src/main/resources/messages_sv_SE.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Kan inte nedgradera nuvarande användares roll

src/main/resources/messages_tr_TR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Kullanıcı bulunamadı.
 incorrectPasswordMessage=Mevcut şifre yanlış.
 usernameExistsMessage=Yeni Kullanıcı Adı zaten var.
 invalidUsernameMessage=Geçersiz kullanıcı adı, kullanıcı adı yalnızca harf, rakam ve aşağıdaki özel karakterleri @._+- içerebilir veya geçerli bir e-posta adresi olmalıdır.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Şu anda oturum açmış olan kullanıcı silinemiyor.
 deleteUsernameExistsMessage=Kullanıcı adı mevcut değil ve silinemez.
 downgradeCurrentUserMessage=Mevcut kullanıcının rolü düşürülemiyor

src/main/resources/messages_uk_UA.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Користувача не знайдено.
 incorrectPasswordMessage=Поточний пароль невірний.
 usernameExistsMessage=Нове ім'я користувача вже існує.
 invalidUsernameMessage=Недійсне ім’я користувача, ім’я користувача може містити лише літери, цифри та наступні спеціальні символи @._+- або має бути дійсною електронною адресою.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Неможливо видалити користувача, який увійшов в систему.
 deleteUsernameExistsMessage=Ім'я користувача не існує і не може бути видалено.
 downgradeCurrentUserMessage=Неможливо понизити роль поточного користувача

src/main/resources/messages_zh_CN.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=未找到用户。
 incorrectPasswordMessage=当前密码不正确。
 usernameExistsMessage=新用户名已存在。
 invalidUsernameMessage=用户名无效，用户名只能包含字母、数字和以下特殊字符@._+- 或必须是有效的电子邮件地址。
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=无法删除当前登录的用户。
 deleteUsernameExistsMessage=用户名不存在，无法删除。
 downgradeCurrentUserMessage=无法降级当前用户的角色

src/main/resources/messages_zh_TW.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=找不到使用者。
 incorrectPasswordMessage=目前密碼不正確。
 usernameExistsMessage=新使用者名稱已存在。
 invalidUsernameMessage=使用者名稱無效，使用者名稱只能包含字母、數字和以下特殊字元@._+- 或必須是有效的電子郵件地址。
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=無法刪除目前登錄的使用者。
 deleteUsernameExistsMessage=使用者名不存在，無法刪除。
 downgradeCurrentUserMessage=無法降級目前使用者的角色

src/main/resources/templates/account.html

@@ -33,15 +33,15 @@
               <!-- Change Username Form -->
               <th:block th:if="${!oAuth2Login}">
               <h4 th:text="#{account.changeUsername}">Change Username?</h4>
-              <form id="formsavechangeusername" class="bg-card mt-4 mb-4" action="api/v1/user/change-username" method="post">
+              <form id="formsavechangeusername" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-username'}" method="post">
                 <div class="mb-3">
                   <label for="newUsername" th:text="#{account.newUsername}">Change Username</label>
                   <input type="text" class="form-control" name="newUsername" id="newUsername" th:placeholder="#{account.newUsername}">
                   <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
                 </div>
                 <div class="mb-3">
-                  <label for="currentPassword" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{password}">
+                  <label for="currentPasswordChangeUsername" th:text="#{password}">Password</label>
+                  <input type="password" class="form-control" name="currentPasswordChangeUsername" id="currentPasswordChangeUsername" th:placeholder="#{password}">
                 </div>
                 <div class="mb-3">
                   <button type="submit" class="btn btn-primary" th:text="#{account.changeUsername}">Change Username</button>
@@ -52,7 +52,7 @@
               <!-- Change Password Form -->
               <th:block th:if="${!oAuth2Login}">
               <h4 th:text="#{account.changePassword}">Change Password?</h4>
-              <form id="formsavechangepassword" class="bg-card mt-4 mb-4" action="api/v1/user/change-password" method="post">
+              <form id="formsavechangepassword" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-password'}" method="post">
                 <div class="mb-3">
                   <label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
                   <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{account.oldPassword}">
@@ -66,6 +66,7 @@
                   <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
                 </div>
                 <div class="mb-3">
+                  <span id="confirmPasswordError" style="display: none;" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
                   <button type="submit" class="btn btn-primary" th:text="#{account.changePassword}">Change Password</button>
                 </div>
               </form>
@@ -103,6 +104,9 @@
                     return this.optional(element) || /^[a-zA-Z0-9][a-zA-Z0-9@._+-]*[a-zA-Z0-9]$|^(?=.{1,64}@)[A-Za-z0-9]+(\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(\.[A-Za-z]{2,})$/.test(value);
                 }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
                 $(document).ready(function() {
+                  $.validator.addMethod("passwordMatch", function(value, element) {
+                    return $('#newPassword').val() === $('#confirmNewPassword').val();
+                  }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
                   $('#formsavechangepassword').validate({
                     rules: {
                       currentPassword: {
@@ -112,17 +116,31 @@
                         required: true
                       },
                       confirmNewPassword: {
-                        required: true
+                        required: true,
+                        passwordMatch: true
+                      },
+                      errorPlacement: function(error, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").text(error.text()).show();
+                          } else {
+                              error.insertAfter(element);
+                          }
+                      },
+                      success: function(label, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").hide();
+                          }
                       }
                     }
                   });
+
                   $('#formsavechangeusername').validate({
                     rules: {
                       newUsername: {
                         required: true,
                         usernamePattern: true
                       },
-                      currentPassword: {
+                      currentPasswordChangeUsername: {
                         required: true
                       }
                       },
@@ -144,32 +162,10 @@
                           }
                       }
                   });
-                  $('#formsavechangepassword').on('submit', function(event) {
-                    var newPassword = $('#newPassword').val();
-                    var confirmNewPassword = $('#confirmNewPassword').val();
-
-                    if (newPassword !== confirmNewPassword) {
-                      alert('New Password and Confirm New Password must match.');
-                      event.preventDefault();
-                    }
-                  });
-                  $('#newUsername').on('input', function() {
-                      var usernameInput = $(this);
-                      var isValid = usernameInput[0].checkValidity();
-                      var errorSpan = $('#usernameError');
-        
-                      if (isValid) {
-                          usernameInput.removeClass('invalid').addClass('valid');
-                          errorSpan.hide();
-                      } else {
-                          usernameInput.removeClass('valid').addClass('invalid');
-                          errorSpan.show();
-                      }
-                  });
                 });
               </script>
 
-              <script>
+              <script th:inline="javascript">
                 function copyToClipboard() {
                   const apiKeyElement = document.getElementById("apiKey");
                   apiKeyElement.select();
@@ -192,8 +188,12 @@
                 }
 
                 document.addEventListener("DOMContentLoaded", async function() {
+                  showApiKey();
                   try {
-                    let response = await fetch('/api/v1/user/get-api-key', { method: 'POST' });
+                    /*<![CDATA[*/
+                    const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
+                    /*]]>*/
+                    let response = await fetch(urlGetApiKey, { method: 'POST' });
                     if (response.status === 200) {
                       let apiKey = await response.text();
                       manageUIState(apiKey);
@@ -207,7 +207,10 @@
 
                 async function refreshApiKey() {
                   try {
-                    let response = await fetch('/api/v1/user/update-api-key', { method: 'POST' });
+                    /*<![CDATA[*/
+                    const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
+                    /*]]>*/
+                    let response = await fetch(urlUpdateApiKey, { method: 'POST' });
                     if (response.status === 200) {
                       let apiKey = await response.text();
                       manageUIState(apiKey);
@@ -229,27 +232,13 @@
                   if (apiKey && apiKey.trim().length > 0) {
                     apiKeyElement.value = apiKey;
                     showBtn.disabled = false;
-                    copyBtn.disabled = true;
+                    copyBtn.disabled = false;
                   } else {
                     apiKeyElement.value = "";
                     showBtn.disabled = true;
                     copyBtn.disabled = true;
                   }
                 }
-
-                document.addEventListener("DOMContentLoaded", function() {
-                  const form = document.querySelector('form[action="api/v1/user/change-password"]');
-
-                  form.addEventListener('submit', function(event) {
-                    const newPassword = document.getElementById('newPassword').value;
-                    const confirmNewPassword = document.getElementById('confirmNewPassword').value;
-
-                    if (newPassword !== confirmNewPassword) {
-                      alert('New Password and Confirm New Password must match.');
-                      event.preventDefault(); // Prevent form submission
-                    }
-                  });
-                });
               </script>
 
               <h4 th:text="#{account.syncTitle}">Sync browser settings with Account</h4>
@@ -315,9 +304,12 @@
                   });
 
                   document.getElementById('syncToAccount').addEventListener('click', function() {
+                    /*<![CDATA[*/
+                    const urlUpdateUserSettings = /*[[@{/api/v1/user/updateUserSettings}]]*/ "/api/v1/user/updateUserSettings";
+                    /*]]>*/
                     let form = document.createElement("form");
                     form.method = "POST";
-                    form.action = "api/v1/user/updateUserSettings";  // Your endpoint URL
+                    form.action = urlUpdateUserSettings;  // Your endpoint URL
 
                     for (let i = 0; i < localStorage.length; i++) {
                       const key = localStorage.key(i);