From dd84b9d79f9a17441ad684e9a4a55142cd784a21 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 21 Aug 2014 16:23:02 -0400
Subject: [PATCH] FIX: Don't skip TOS check when using 3rd party auth

---
 .../javascripts/discourse/controllers/create-account.js.es6   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index ffb2c8e5d6a..92a1c0d5127 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -37,9 +37,11 @@ export default DiscourseController.extend(ModalFunctionality, {
   },
 
   submitDisabled: function() {
+    // Even if password is required, we respect the tos setting
+    if (this.get('tosAcceptRequired') && !this.get('tosAccepted')) return true;
+
     if (!this.get('passwordRequired')) return false; // 3rd party auth
     if (this.get('formSubmitted')) return true;
-    if (this.get('tosAcceptRequired') && !this.get('tosAccepted')) return true;
     if (this.get('nameValidation.failed')) return true;
     if (this.get('emailValidation.failed')) return true;
     if (this.get('usernameValidation.failed')) return true;