diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index 69f1b758f..b2e6c709f 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -614,11 +614,20 @@
                             else
                             {
                                 [self.authenticationActivityIndicator stopAnimating];
-
-                                // Show the supported 3rd party ids which may be added to the account
-                                authInputsview.thirdPartyIdentifiersHidden = NO;
-
-                                [self updateRegistrationScreenWithThirdPartyIdentifiersHidden:NO];
+                                
+                                BOOL isIdentityServerConfigured = self.identityServerTextField.text.length > 0;
+                                
+                                if (isIdentityServerConfigured)
+                                {
+                                    // Show the supported 3rd party ids which may be added to the account
+                                    authInputsview.thirdPartyIdentifiersHidden = NO;
+                                    [self updateRegistrationScreenWithThirdPartyIdentifiersHidden:NO];
+                                }
+                                else
+                                {
+                                    // Do not propose to add 3rd party ids if there is no configured Identity Server
+                                    [super onButtonPressed:sender];
+                                }
                             }
                         }];
                     }