diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index aa16c2479..ffc8dfb75 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -292,6 +292,12 @@
 "settings_confirm_password" = "Neues Passwort bestätigen";
 "settings_password_updated" = "Dein Passwort wurde aktualisiert";
 "settings_password_condition" = "Regeln: Mindestlänge 8 Zeichen, mind. 1 Sonderzeichen, 1 Groß- und 1 Kleinbuchstaben und 1 Ziffer";
+"settings_password_too_short_message" = "Das Passwort muss aus mindestens 8 Zeichen bestehen";
+"settings_password_has_no_digit" = "Das Passwort muss mindestens eine Ziffer enthalten";
+"settings_password_has_no_symbol" = "Das Passwort muss mindestens ein Sonderzeichen enthalten";
+"settings_password_has_no_uppercase_letter" = "Das Passwort muss mindestens einen Großbuchstaben enthalten";
+"settings_password_has_no_lowercase_letter" = "Das Passwort muss mindestens einen Kleinbuchstaben enthalten";
+
 "settings_crypto_device_name" = "Öffentlicher Sitzungs-Name: ";
 "settings_crypto_device_key" = "\nSitzungs-Schlüssel:\n";
 "settings_crypto_export" = "Schlüssel exportieren";
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 344cae848..cf4e8f076 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -700,6 +700,11 @@ Tap the + to start adding people.";
 "settings_fail_to_update_password" = "Fail to update password";
 "settings_password_updated" = "Your password has been updated";
 "settings_password_condition" = "Rules: Minimum length 8 characters, at least 1 special character, 1 uppercase and 1 lowercase letter and 1 number";
+"settings_password_too_short_message" = "The password must be at least 8 characters long";
+"settings_password_has_no_digit" = "The password must include at least one digit";
+"settings_password_has_no_symbol" = "The password must include at least one symbol";
+"settings_password_has_no_uppercase_letter" = "The password must include at least one uppercase letter";
+"settings_password_has_no_lowercase_letter" = "The password must include at least one lowercase letter";
 
 "settings_add_3pid_password_title_email" = "Add email address";
 "settings_add_3pid_password_title_msidsn" = "Add phone number";
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index f3e06d3f6..607c7b937 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -4568,6 +4568,26 @@ ThreadsBetaCoordinatorBridgePresenterDelegate>
                     
                 } failure:^(NSError *error) {
                     
+                    NSString *serverResponse = [error localizedDescription];
+                    NSString *alertMessage;
+                    if ([serverResponse isEqualToString: @"The password must be at least 8 characters long"]) {
+                        alertMessage = [VectorL10n settingsPasswordTooShortMessage];
+                    }
+                    else if ([serverResponse isEqualToString: @"The password must include at least one digit"]) {
+                        alertMessage = [VectorL10n settingsPasswordHasNoDigit];
+                    }
+                    else if ([serverResponse isEqualToString: @"The password must include at least one symbol"]) {
+                        alertMessage = [VectorL10n settingsPasswordHasNoSymbol];
+                    }
+                    else if ([serverResponse isEqualToString: @"The password must include at least one uppercase letter"]) {
+                        alertMessage = [VectorL10n settingsPasswordHasNoUppercaseLetter];
+                    }
+                    else if ([serverResponse isEqualToString: @"The password must include at least one lowercase letter"]) {
+                        alertMessage = [VectorL10n settingsPasswordHasNoLowercaseLetter];
+                    } else {
+                        alertMessage = [VectorL10n settingsFailToUpdatePassword];
+                    }
+
                     if (weakSelf)
                     {
                         typeof(self) self = weakSelf;
@@ -4581,7 +4601,7 @@ ThreadsBetaCoordinatorBridgePresenterDelegate>
                         {
                             [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
                             
-                            UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsFailToUpdatePassword] preferredStyle:UIAlertControllerStyleAlert];
+                            UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:nil message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
                             
                             [errorAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n ok]
                                                                                    style:UIAlertActionStyleDefault