diff --git a/packages/theme/lang/de.js b/packages/theme/lang/de.js
index a2bcf5097..c9d942fc7 100644
--- a/packages/theme/lang/de.js
+++ b/packages/theme/lang/de.js
@@ -277,4 +277,6 @@ export default {
   "From": "Aus",
   "To": "Zu",
   "Your customization": "Ihre Anpassung",
+  "Passwords don't match":"Passwörter stimmen nicht überein",
+  "The password must be at least 8 characters long and must contain at least: 1 uppercase or lowercase letter, 1 number, or one special character (E.g. , . _ & ? etc)":"Das Passwort muss mindestens 8 Zeichen lang sein und muss mindestens enthalten: 1 Groß- oder Kleinbuchstabe, 1 Ziffer oder ein Sonderzeichen (z. B. , . _ & ? usw.)"
 };
diff --git a/packages/theme/lang/en.js b/packages/theme/lang/en.js
index dad02d099..5a52871b4 100644
--- a/packages/theme/lang/en.js
+++ b/packages/theme/lang/en.js
@@ -275,4 +275,6 @@ export default {
   "From": "From",
   "To": "To",
   "Your customization": "Your customization",
+  "Passwords don't match":"Passwords don't match",
+  "The password must be at least 8 characters long and must contain at least: 1 uppercase or lowercase letter, 1 number, or one special character (E.g. , . _ & ? etc)":"The password must be at least 8 characters long and must contain at least: 1 uppercase or lowercase letter, 1 number, or one special character (E.g. , . _ & ? etc)"
 };
diff --git a/packages/theme/modules/customer/composables/useUser/index.ts b/packages/theme/modules/customer/composables/useUser/index.ts
index 0da71e8d9..33043e761 100644
--- a/packages/theme/modules/customer/composables/useUser/index.ts
+++ b/packages/theme/modules/customer/composables/useUser/index.ts
@@ -280,14 +280,17 @@ export function useUser(): UseUserInterface {
         customQuery: params.customQuery,
       });
 
+      let joinedErrors = null;
+
       if (errors) {
-        Logger.error(errors.map((e) => e.message).join(','));
+        joinedErrors = errors.map((e) => e.message).join(',');
+        Logger.error(joinedErrors);
       }
 
       Logger.debug('[Result] ', { data });
 
       customerStore.user = data?.changeCustomerPassword;
-      error.value.changePassword = null;
+      error.value.changePassword = joinedErrors;
     } catch (err) {
       error.value.changePassword = err;
       Logger.error('useUser/changePassword', err);