diff --git a/client/cypress/e2e/auth/auth.cy.ts b/client/cypress/e2e/auth/auth.cy.ts
index 162fdf6f0eb6cae229b6bee4665dfcf64c4be4a8..03ea6e37597375666897618741ac7f4a588d5cd2 100644
--- a/client/cypress/e2e/auth/auth.cy.ts
+++ b/client/cypress/e2e/auth/auth.cy.ts
@@ -44,7 +44,7 @@ describe('authentication', () => {
 
     cy.get('[data-cy="login-button"]').contains('Log in').click();
 
-    cy.get('.MuiAlert-message').contains('Incorrect password');
+    cy.get('.MuiAlert-message').contains('Invalid credentials');
   });
 
   it('log in without UI', () => {
diff --git a/client/src/contexts/AlertSnackbarProvider.tsx b/client/src/contexts/AlertSnackbarProvider.tsx
index 099291ea039ac8378ded86b3106c4347983f52e9..a9f4f3153a83bf4fe6ab50a39ef66461ab0a9a9e 100644
--- a/client/src/contexts/AlertSnackbarProvider.tsx
+++ b/client/src/contexts/AlertSnackbarProvider.tsx
@@ -81,7 +81,7 @@ type AlertMessageKeys =
   | 'unknown_error_alert'
   | 'username_input_helper_text_empty'
   | 'password_input_helper_text_empty'
-  | 'login_invalid_password'
+  | 'login_invalid_credentials'
   | 'registration_success'
   | '';
 
@@ -111,8 +111,8 @@ const AlertSnackbarProvider = ({ children }: WithChildren) => {
           return t('username_input_helper_text_empty');
         case 'password_input_helper_text_empty':
           return t('password_input_helper_text_empty');
-        case 'login_invalid_password':
-          return t('login_invalid_password');
+        case 'login_invalid_credentials':
+          return t('login_invalid_credentials');
         case 'registration_success':
           return t('registration_success');
         case 'redirect_admin_setup_complete':
diff --git a/client/src/locale/en/translation.json b/client/src/locale/en/translation.json
index 8f18869e2604fbcea11a24bebbaf258d145964fd..74b4ce2b34710f966eefbe0a0cd86cd5aa20a229 100644
--- a/client/src/locale/en/translation.json
+++ b/client/src/locale/en/translation.json
@@ -80,8 +80,6 @@
   "login_form_to_registration_text": "Need an account?",
   "login_form_username_tooltip": "The username you registered with",
   "login_invalid_credentials": "Invalid credentials",
-  "login_invalid_password": "Incorrect password",
-  "login_username_not_found": "Username not found",
   "logout": "Log out",
   "Menu": "Menu",
   "message_call_incoming": "Incoming call - {{duration}}",
diff --git a/client/src/locale/fr/translation.json b/client/src/locale/fr/translation.json
index b0e385b284693407a00f566b1819e2d8b6386f91..5dbab8121a5a555e97930c68ce0adda1da429803 100644
--- a/client/src/locale/fr/translation.json
+++ b/client/src/locale/fr/translation.json
@@ -80,8 +80,6 @@
   "login_form_to_registration_text": "Besoin d'un compte?",
   "login_form_username_tooltip": "Le nom d'utilisateur avec lequel vous vous êtes inscrit(e)",
   "login_invalid_credentials": "Identifiants incorrects",
-  "login_invalid_password": "Mot de passe incorrect",
-  "login_username_not_found": "Nom d'utilisateur introuvable",
   "logout": "Se déconnecter",
   "Menu": "Menu",
   "message_call_incoming": "Appel sortant - {{duration}}",
diff --git a/client/src/services/adminQueries.ts b/client/src/services/adminQueries.ts
index d1037eae415d35e7349ddff20632caf86a51da30..b4a61914908418692cdffcae21eed3bc1601d1a2 100644
--- a/client/src/services/adminQueries.ts
+++ b/client/src/services/adminQueries.ts
@@ -43,7 +43,7 @@ export const useSetupAdminMutation = () => {
     onError: (e: any) => {
       if (e.response?.status === HttpStatusCode.BadRequest) {
         setAlertContent({
-          messageI18nKey: 'login_invalid_password',
+          messageI18nKey: 'login_invalid_credentials',
           severity: 'error',
           alertOpen: true,
         });
@@ -87,7 +87,7 @@ export const useLoginAdminMutation = () => {
         });
       } else if (e.response?.status === HttpStatusCode.Unauthorized) {
         setAlertContent({
-          messageI18nKey: 'login_invalid_password',
+          messageI18nKey: 'login_invalid_credentials',
           severity: 'error',
           alertOpen: true,
         });
diff --git a/client/src/services/authQueries.ts b/client/src/services/authQueries.ts
index 45f78dd57cf6daf0bb6562f467ece68f355ddd44..8b50a5f17cb0de2f49a5922a8ad8f4167a8d4e0d 100644
--- a/client/src/services/authQueries.ts
+++ b/client/src/services/authQueries.ts
@@ -140,7 +140,7 @@ export const useLoginMutation = () => {
         //TODO: there are two different not found responses that could be returned by the server, use message to differentiate them?
         //continue when the auth flow is clear
       } else if (status === HttpStatusCode.Unauthorized) {
-        setAlertContent({ messageI18nKey: 'login_invalid_password', severity: 'error', alertOpen: true });
+        setAlertContent({ messageI18nKey: 'login_invalid_credentials', severity: 'error', alertOpen: true });
       } else {
         setAlertContent({ messageI18nKey: 'unknown_error_alert', severity: 'error', alertOpen: true });
       }
diff --git a/server/src/routers/auth-router.ts b/server/src/routers/auth-router.ts
index 736bfc29adfac0be6ada6bf3abdf1e862938903d..b5b239930b2f7fd9a0706ae77c01aba761302424 100644
--- a/server/src/routers/auth-router.ts
+++ b/server/src/routers/auth-router.ts
@@ -107,14 +107,14 @@ authRouter.post(
     // Check if the account is stored on this daemon instance
     const accountId = jamid.getAccountIdFromUsername(username);
     if (accountId === undefined) {
-      res.status(HttpStatusCode.NotFound).send('Username not found');
+      res.status(HttpStatusCode.Unauthorized).send('Username not found');
       return;
     }
 
     const hashedPassword = accounts.get(username, isJams);
     if (hashedPassword === undefined) {
       res
-        .status(HttpStatusCode.NotFound)
+        .status(HttpStatusCode.Unauthorized)
         .send('Password not found (the account does not have a password set on the server)');
       return;
     }