diff --git a/features/personas/ChangePassword.feature b/features/personas/ChangePassword.feature
index 5d55b957d5..be9d89a1a0 100644
--- a/features/personas/ChangePassword.feature
+++ b/features/personas/ChangePassword.feature
@@ -8,7 +8,7 @@ Feature: Verify that an User allowed to change password can change his password
     And I switch to "Account settings" tab in User settings
     And I click on the change password button
     And I change password from "Passw0rd-42" to "Passw0rd-43"
-    And I perform the "Update" action
+    And I perform the "Save and close" action
     Then success notification that "Your password has been successfully changed." appears
     And I should be on "User settings" page
 
diff --git a/src/bundle/Resources/translations/ibexa_menu.en.xliff b/src/bundle/Resources/translations/ibexa_menu.en.xliff
index db76437a17..0cd88856a3 100644
--- a/src/bundle/Resources/translations/ibexa_menu.en.xliff
+++ b/src/bundle/Resources/translations/ibexa_menu.en.xliff
@@ -567,13 +567,13 @@
         <note>key: user_edit__sidebar_right__update</note>
       </trans-unit>
       <trans-unit id="d79a55ddd58ecf56b4edb39c794c858d649481e2" resname="user_password_change__sidebar_right__cancel">
-        <source>Discard changes</source>
-        <target state="new">Discard changes</target>
+        <source>Discard</source>
+        <target state="new">Discard</target>
         <note>key: user_password_change__sidebar_right__cancel</note>
       </trans-unit>
       <trans-unit id="ab8629add84cbd9cebfdf326f7242044ae7650af" resname="user_password_change__sidebar_right__update">
-        <source>Update</source>
-        <target state="new">Update</target>
+        <source>Save and close</source>
+        <target state="new">Save and close</target>
         <note>key: user_password_change__sidebar_right__update</note>
       </trans-unit>
       <trans-unit id="aa3770fa627988e02e932de7ea7f99b9c5e74bcd" resname="user_setting_update__sidebar_right__cancel">
diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff
index 1490315158..ae65c77920 100644
--- a/src/bundle/Resources/translations/messages.en.xliff
+++ b/src/bundle/Resources/translations/messages.en.xliff
@@ -503,16 +503,16 @@
         <target state="new">Change password</target>
         <note>key: my_account_settings.password.action.edit</note>
       </trans-unit>
+      <trans-unit id="0305297fa410b3bfb22eb87fa2bea63dabf7e2d6" resname="my_account_settings.password.message">
+        <source>You don't have permissions to change the password. Contact your administrator.</source>
+        <target state="new">You don't have permissions to change the password. Contact your administrator.</target>
+        <note>key: my_account_settings.password.message</note>
+      </trans-unit>
       <trans-unit id="2273b0c5061ff374bd0d5a75e9301721f7312b65" resname="my_account_settings.password.title">
         <source>Password</source>
         <target state="new">Password</target>
         <note>key: my_account_settings.password.title</note>
       </trans-unit>
-      <trans-unit id="0305297fa410b3bfb22eb87fa2bea63dabf7e2d6" resname="my_account_settings.password.message">
-        <source>You don't have permissions to change the password. Contact your administrator.</source>
-        <target state="new">You don't have permissions to change the password. Contact your administrator.</target>
-        <note>key: user.password.message</note>
-      </trans-unit>
       <trans-unit id="5b03625b8de51d296ad7f4bc980e631c964185d8" resname="notification.no_longer_available">
         <source>The Content item is no longer available</source>
         <target state="new">The Content item is no longer available</target>
diff --git a/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php b/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php
index a6c287ce3d..13de8901ee 100644
--- a/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php
+++ b/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php
@@ -68,8 +68,8 @@ public function onUserPasswordChangeRightSidebarConfigure(ConfigureMenuEvent $ev
     public static function getTranslationMessages(): array
     {
         return [
-            (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'),
-            (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'),
+            (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save and close'),
+            (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'),
         ];
     }
 }
diff --git a/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php b/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php
index 97a837b45e..2cef1b61e0 100644
--- a/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php
+++ b/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php
@@ -90,8 +90,8 @@ public function createStructure(array $options): ItemInterface
     public static function getTranslationMessages(): array
     {
         return [
-            (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'),
-            (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'),
+            (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save and close'),
+            (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'),
         ];
     }
 }