diff --git a/Vector/Vector-Defaults.plist b/Vector/Vector-Defaults.plist
index 447e87d76..8c60cb6a0 100644
--- a/Vector/Vector-Defaults.plist
+++ b/Vector/Vector-Defaults.plist
@@ -11,7 +11,7 @@
 	<key>identityserverurl</key>
 	<string>https://vector.im</string>
 	<key>homeserverurl</key>
-	<string>https://matrix.org</string>
+	<string>https://vector.im</string>
 	<key>homeserver</key>
 	<string>matrix.org</string>
 	<key>webAppUrlDev</key>
diff --git a/Vector/ViewController/AuthenticationViewController.m b/Vector/ViewController/AuthenticationViewController.m
index a488bf114..a4b8ecee9 100644
--- a/Vector/ViewController/AuthenticationViewController.m
+++ b/Vector/ViewController/AuthenticationViewController.m
@@ -22,6 +22,17 @@
 
 #import "VectorDesignValues.h"
 
+@interface AuthenticationViewController ()
+{
+    /**
+     Store the potential login error received by using the new default homeserver (vector.im)
+     while we retry a login process against the matrix.org HS.
+     */
+    NSError *loginError;
+}
+
+@end
+
 @implementation AuthenticationViewController
 
 + (UINib *)nib
@@ -212,6 +223,48 @@
     }
 }
 
+- (void)onFailureDuringAuthRequest:(NSError *)error
+{
+    // Homeserver migration: the default homeserver url has been updated with https://vector.im.
+    // The login process with an existing matrix.org accounts will then fail.
+    // Patch: Falling back to matrix.org HS so we don't break everyone's logins
+    if (self.authType == MXKAuthenticationTypeLogin)
+    {
+        if ([self.homeServerTextField.text isEqualToString:@"https://vector.im"])
+        {
+            MXError *mxError = [[MXError alloc] initWithNSError:error];
+            if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringForbidden])
+            {
+                // Retry against the matrix.org HS
+                NSLog(@"[MXKAuthenticationVC] Falling back to matrix.org HS");
+                
+                loginError = error;
+                [self setHomeServerTextFieldText:@"https://matrix.org"];
+                
+                [self onButtonPressed:self.submitButton];
+                
+                return;
+            }
+        }
+        else if (loginError)
+        {
+            // This is not an existing matrix.org accounts
+            NSLog(@"[MXKAuthenticationVC] This is not an existing matrix.org accounts");
+            
+            // Restore the default HS
+            [self setHomeServerTextFieldText: @"https://vector.im"];
+            
+            // Consider the original login error
+            [super onFailureDuringAuthRequest:loginError];
+            loginError = nil;
+            
+            return;
+        }
+    }
+    
+    [super onFailureDuringAuthRequest:loginError];
+}
+
 #pragma mark -
 
 - (void)hideServerOptionsContainer:(BOOL)hidden