diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 3746e2913..ffb2c8e5d 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -16,7 +16,9 @@ export default DiscourseController.extend(ModalFunctionality, {
   prefilledUsername: null,
   tosAccepted: false,
 
+  hasAuthOptions: Em.computed.notEmpty('authOptions'),
   canCreateLocal: Discourse.computed.setting('enable_local_logins'),
+  showCreateForm: Em.computed.or('hasAuthOptions', 'canCreateLocal'),
 
   resetForm: function() {
     this.setProperties({
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 915a97110..4807af3ac 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -128,16 +128,19 @@ export default DiscourseController.extend(ModalFunctionality, {
 
   authenticationComplete: function(options) {
     if (options.requires_invite) {
+      this.send('showLogin');
       this.flash(I18n.t('login.requires_invite'), 'success');
       this.set('authenticate', null);
       return;
     }
     if (options.awaiting_approval) {
+      this.send('showLogin');
       this.flash(I18n.t('login.awaiting_approval'), 'success');
       this.set('authenticate', null);
       return;
     }
     if (options.awaiting_activation) {
+      this.send('showLogin');
       this.flash(I18n.t('login.awaiting_confirmation'), 'success');
       this.set('authenticate', null);
       return;
diff --git a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
index 2bf6efcf4..99927915b 100644
--- a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
@@ -1,8 +1,10 @@
 {{#unless complete}}
   <div class="modal-body">
-    {{login-buttons action="externalLogin"}}
+    {{#unless hasAuthOptions}}
+      {{login-buttons action="externalLogin"}}
+    {{/unless}}
 
-    {{#if canCreateLocal}}
+    {{#if showCreateForm}}
       <div>
         <form>
         <table>
@@ -73,7 +75,7 @@
     {{/if}}
   </div>
 
-  {{#if canCreateLocal}}
+  {{#if showCreateForm}}
     <div class="modal-footer">
       {{#if tosAcceptRequired}}
         <div class="tos-agree">