diff --git a/Vector/ViewController/RoomSettingsViewController.m b/Vector/ViewController/RoomSettingsViewController.m
index 750781ee5..4585ce28e 100644
--- a/Vector/ViewController/RoomSettingsViewController.m
+++ b/Vector/ViewController/RoomSettingsViewController.m
@@ -808,10 +808,13 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
     {
         NSString* currentTopic = mxRoomState.topic;
         
+        // Remove white space from both ends
+        NSString* topic = [textView.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        
         // Check whether the topic has been actually changed
-        if ((textView.text || currentTopic) && ([textView.text isEqualToString:currentTopic] == NO))
+        if ((topic || currentTopic) && ([topic isEqualToString:currentTopic] == NO))
         {
-            [updatedItemsDict setObject:(textView.text ? textView.text : @"") forKey:kRoomSettingsTopicKey];
+            [updatedItemsDict setObject:(topic ? topic : @"") forKey:kRoomSettingsTopicKey];
         }
         else
         {
@@ -826,7 +829,11 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
 
 - (void)textFieldDidBeginEditing:(UITextField *)textField
 {
-    if (textField == addAddressTextField)
+    if (textField == nameTextField)
+    {
+        nameTextField.textAlignment = NSTextAlignmentLeft;
+    }
+    else if (textField == addAddressTextField)
     {
         if (textField.text.length == 0)
         {
@@ -836,7 +843,11 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
 }
 - (void)textFieldDidEndEditing:(UITextField *)textField
 {
-    if (textField == addAddressTextField)
+    if (textField == nameTextField)
+    {
+        nameTextField.textAlignment = NSTextAlignmentRight;
+    }
+    else if (textField == addAddressTextField)
     {
         if (textField.text.length < 2)
         {
@@ -907,7 +918,12 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {
-    if (textField == addAddressTextField)
+    if (textField == nameTextField)
+    {
+        // Dismiss the keyboard
+        [nameTextField resignFirstResponder];
+    }
+    else if (textField == addAddressTextField)
     {
         // Dismiss the keyboard
         [addAddressTextField resignFirstResponder];
@@ -929,12 +945,15 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
 {
     if (textField == nameTextField)
     {
-        NSString* currentName = mxRoomState.name;
+        NSString *currentName = mxRoomState.name;
+        
+        // Remove white space from both ends
+        NSString *displayName = [textField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
         
         // Check whether the name has been actually changed
-        if ((textField.text || currentName) && ([textField.text isEqualToString:currentName] == NO))
+        if ((displayName || currentName) && ([displayName isEqualToString:currentName] == NO))
         {
-            [updatedItemsDict setObject:(textField.text ? textField.text : @"") forKey:kRoomSettingsNameKey];
+            [updatedItemsDict setObject:(displayName ? displayName : @"") forKey:kRoomSettingsNameKey];
         }
         else
         {
@@ -1856,6 +1875,7 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
             MXKTableViewCellWithLabelAndTextField *roomNameCell = [tableView dequeueReusableCellWithIdentifier:kRoomSettingsNameCellViewIdentifier forIndexPath:indexPath];
             
             roomNameCell.mxkLabelLeadingConstraint.constant = roomNameCell.separatorInset.left;
+            roomNameCell.mxkTextFieldLeadingConstraint.constant = 16;
             roomNameCell.mxkTextFieldTrailingConstraint.constant = 15;
             
             roomNameCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_room_name", @"Vector", nil);
@@ -1870,6 +1890,7 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
             nameTextField.font = [UIFont systemFontOfSize:17];
             nameTextField.borderStyle = UITextBorderStyleNone;
             nameTextField.textAlignment = NSTextAlignmentRight;
+            nameTextField.delegate = self;
             
             if ([updatedItemsDict objectForKey:kRoomSettingsNameKey])
             {
diff --git a/Vector/ViewController/SettingsViewController.m b/Vector/ViewController/SettingsViewController.m
index d45c49228..0de6047ee 100644
--- a/Vector/ViewController/SettingsViewController.m
+++ b/Vector/ViewController/SettingsViewController.m
@@ -592,6 +592,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
     MXKTableViewCellWithLabelAndTextField *cell = [tableview dequeueReusableCellWithIdentifier:[MXKTableViewCellWithLabelAndTextField defaultReuseIdentifier] forIndexPath:indexPath];
     
     cell.mxkLabelLeadingConstraint.constant = cell.separatorInset.left;
+    cell.mxkTextFieldLeadingConstraint.constant = 16;
     cell.mxkTextFieldTrailingConstraint.constant = 15;
     
     cell.mxkLabel.textColor = kVectorTextColorBlack;
@@ -716,6 +717,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
             displaynameCell.mxkTextField.text = myUser.displayname;
             
             displaynameCell.mxkTextField.tag = row;
+            displaynameCell.mxkTextField.delegate = self;
             [displaynameCell.mxkTextField removeTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
             [displaynameCell.mxkTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
             
@@ -1781,7 +1783,8 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
     
     if (textField.tag == userSettingsDisplayNameIndex)
     {
-        newDisplayName = textField.text;
+        // Remove white space from both ends
+        newDisplayName = [textField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
         [self updateSaveButtonStatus];
     }
     else if (textField.tag == userSettingsNewEmailIndex)
@@ -1802,9 +1805,33 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
 }
 
 #pragma mark - UITextField delegate
+
+- (void)textFieldDidBeginEditing:(UITextField *)textField
+{
+    if (textField.tag == userSettingsDisplayNameIndex)
+    {
+        textField.textAlignment = NSTextAlignmentLeft;
+    }
+}
+- (void)textFieldDidEndEditing:(UITextField *)textField
+{
+    if (textField.tag == userSettingsDisplayNameIndex)
+    {
+        textField.textAlignment = NSTextAlignmentRight;
+    }
+}
+
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {
-    [self onAddNewEmail:textField];
+    if (textField.tag == userSettingsDisplayNameIndex)
+    {
+        [textField resignFirstResponder];
+    }
+    else if (textField.tag == userSettingsNewEmailIndex)
+    {
+        [self onAddNewEmail:textField];
+    }
+    
     return YES;
 }
 
diff --git a/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib b/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib
index 35cf1afa6..af2fa19dd 100644
--- a/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib
+++ b/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib
@@ -34,7 +34,7 @@
                     </textView>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="6xh-yB-9FP" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="DE7-uC-Oz2" secondAttribute="trailing" constant="8" id="oCm-jb-bm0"/>
+                    <constraint firstItem="6xh-yB-9FP" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="DE7-uC-Oz2" secondAttribute="trailing" constant="16" id="oCm-jb-bm0"/>
                     <constraint firstItem="DE7-uC-Oz2" firstAttribute="leading" secondItem="hCm-wd-Yup" secondAttribute="leading" constant="15" id="qse-r7-x6e"/>
                 </constraints>
             </tableViewCellContentView>