diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index 6c5f7aa47d..d40090c3d8 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -739,7 +739,7 @@ - (void)showClearDataAfterSoftLogoutConfirmation
     }
 
     alert = [UIAlertController alertControllerWithTitle:[VectorL10n authSoftlogoutClearDataSignOutTitle]
-                                                message:[VectorL10n  authSoftlogoutClearDataSignOutMsg]
+                                                message:[VectorL10n authSoftlogoutClearDataSignOutMsg]
                                          preferredStyle:UIAlertControllerStyleAlert];
 
 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 538b02bb1b..7fc46819af 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -5144,7 +5144,7 @@ - (void)eventDidChangeSentState:(NSNotification *)notif
         }
         
         currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n unknownDevicesAlertTitle]
-                                                           message:[VectorL10n unknownDevicesAlertTitle]
+                                                           message:[VectorL10n unknownDevicesAlert]
                                                     preferredStyle:UIAlertControllerStyleAlert];
         
         [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesVerify]
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index 33284c4e9e..67b66479e0 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -239,7 +239,7 @@ - (void)presentPasswordRequiredAlertWithSubmitHandler:(void (^)(NSString *passwo
     
     __weak typeof(self) weakSelf = self;
     
-    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 UITextField *textField = alert.textFields.firstObject;
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index d992337499..f2288fae9e 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -1375,7 +1375,7 @@ - (void)showAuthenticationIfNeededForAdding:(MX3PIDMedium)medium withSession:(MX
         title = [VectorL10n settingsAdd3pidPasswordTitleEmail];
     }
     
-    NSString *message = [VectorL10n settingsAdd3pidInvalidPasswordMessage];
+    NSString *message = [VectorL10n settingsAdd3pidPasswordMessage];
     
     
     [session.matrixRestClient add3PIDOnlyWithSessionId:@"" clientSecret:[MXTools generateSecret] authParams:nil success:^{
diff --git a/Riot/Utils/Tools.m b/Riot/Utils/Tools.m
index dfb212b84e..aefdea6425 100644
--- a/Riot/Utils/Tools.m
+++ b/Riot/Utils/Tools.m
@@ -47,7 +47,7 @@ + (NSString *)presenceText:(MXUser *)user
         
         if (user.currentlyActive)
         {
-            presenceText = [presenceText stringByAppendingString:[VectorL10n roomParticipantsNow]];
+            presenceText = [presenceText stringByAppendingString:[NSString stringWithFormat:@" %@",[VectorL10n roomParticipantsNow]]];
         }
         else if (-1 != user.lastActiveAgo && 0 < user.lastActiveAgo)
         {