diff --git a/res/css/views/login/_InteractiveAuthEntryComponents.scss b/res/css/views/login/_InteractiveAuthEntryComponents.scss
index 11f55e69f8..e2ea7d86fb 100644
--- a/res/css/views/login/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/login/_InteractiveAuthEntryComponents.scss
@@ -30,19 +30,29 @@ limitations under the License.
     border: 1px solid $accent-color;
 }
 
-.mx_InteractiveAuthEntryComponents_msisdnSubmit,
-.mx_InteractiveAuthEntryComponents_termsSubmit {
+.mx_InteractiveAuthEntryComponents_msisdnSubmit {
     margin-top: 4px;
     margin-bottom: 5px;
 }
 
+.mx_InteractiveAuthEntryComponents_termsSubmit {
+    margin-top: 20px;
+    margin-bottom: 5px;
+    display: block;
+    width: 100%;
+}
+
 // XXX: This should be a common button class
-.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled,
-.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
+.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled {
     background-color: $light-fg-color;
     cursor: default;
 }
 
+.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
+    background-color: $accent-color-50pct;
+    cursor: default;
+}
+
 .mx_InteractiveAuthEntryComponents_termsPolicy {
     display: block;
 }
\ No newline at end of file
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 8ab338790e..d0594d820c 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -12,6 +12,7 @@ $light-fg-color: #747474;
 // button UI (white-on-green in light skin)
 $accent-fg-color: $primary-bg-color;
 $accent-color: #76CFA6;
+$accent-color-50pct: #76CFA67F;
 
 $selection-fg-color: $primary-fg-color;
 
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index c7fd38259c..a6f28fd14b 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -18,6 +18,7 @@ $focus-bg-color: #dddddd;
 // button UI (white-on-green in light skin)
 $accent-fg-color: #ffffff;
 $accent-color: #76CFA6;
+$accent-color-50pct: #76CFA67F;
 
 $selection-fg-color: $primary-bg-color;
 
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 26b93c9fbe..6c1d11f82a 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -335,7 +335,7 @@ export const TermsAuthEntry = React.createClass({
         if (!this.props.hideContinue) {
             // XXX: button classes
             submitButton = <button className="mx_InteractiveAuthEntryComponents_termsSubmit mx_UserSettings_button"
-                                   onClick={this._trySubmit}>{_t("Continue")}</button>;
+                                   onClick={this._trySubmit} disabled={!allChecked}>{_t("Accept")}</button>;
         }
 
         return (