diff --git a/submodules/users/users.js b/submodules/users/users.js
index 0d221c2..c2d258b 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2166,6 +2166,7 @@ define(function(require) {
formData.failover = true;
} else {
formData.enabled = true;
+ formData.failover = false;
}
formData.number = monster.util.unformatPhoneNumber(formData.number, 'keepPlus');
diff --git a/views/users-feature-call_forward.html b/views/users-feature-call_forward.html
index b18b1f1..c05c8ee 100644
--- a/views/users-feature-call_forward.html
+++ b/views/users-feature-call_forward.html
@@ -56,11 +56,6 @@
{{/monsterCheckbox}}
-
{{#if extra.timeoutTooShort}}