diff --git a/packages/composables/src/composables/useUser/index.ts b/packages/composables/src/composables/useUser/index.ts
index fbaf89768..e3585f086 100644
--- a/packages/composables/src/composables/useUser/index.ts
+++ b/packages/composables/src/composables/useUser/index.ts
@@ -139,10 +139,8 @@ CustomerCreateInput
   changePassword: async (context: Context, params) => {
     Logger.debug('[Magento] changing user password');
     const { data, errors } = await context.$magento.api.changeCustomerPassword(params);
-
     if (errors) {
       Logger.error(errors);
-
       throw new Error(errors.map((e) => e.message).join(','));
     }
 
diff --git a/packages/theme/components/MyAccount/PasswordResetForm.vue b/packages/theme/components/MyAccount/PasswordResetForm.vue
index 986d8513e..7b7d3144c 100644
--- a/packages/theme/components/MyAccount/PasswordResetForm.vue
+++ b/packages/theme/components/MyAccount/PasswordResetForm.vue
@@ -101,10 +101,10 @@ export default defineComponent({
         resetValidationFn();
       };
 
-      const onError = () => {
+      const onError = (msg) => {
         sendNotification({
           id: Symbol('password_not_updated'),
-          message: 'It was not possible to update your password.',
+          message: msg,
           type: 'danger',
           icon: 'cross',
           persist: false,
diff --git a/packages/theme/pages/MyAccount/MyProfile.vue b/packages/theme/pages/MyAccount/MyProfile.vue
index 27b634cf1..c50a342ff 100644
--- a/packages/theme/pages/MyAccount/MyProfile.vue
+++ b/packages/theme/pages/MyAccount/MyProfile.vue
@@ -79,15 +79,15 @@ export default defineComponent({
       load,
       loading,
       updateUser,
+      error,
     } = useUser();
 
     const formHandler = async (fn, onComplete, onError) => {
-      try {
-        const data = await fn();
-        if (!data) throw new Error('API Error');
-        await onComplete(data);
-      } catch (error) {
-        onError(error);
+      await fn();
+      if (error.value.changePassword !== null) {
+        onError(error.value.changePassword);
+      } else {
+        onComplete();
       }
     };
 
@@ -100,13 +100,14 @@ export default defineComponent({
       onComplete,
       onError,
     );
+
     const updatePassword = ({
       form,
       onComplete,
       onError,
     }) => formHandler(async () => changePassword({
-      currentPassword: form.value.currentPassword,
-      newPassword: form.value.newPassword,
+      current: form.value.currentPassword,
+      new: form.value.newPassword,
     }), onComplete, onError);
 
     onSSR(async () => {