diff --git a/submodules/users/users.js b/submodules/users/users.js
index 66f675f..0d221c2 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2166,7 +2166,6 @@ define(function(require) {
 						formData.failover = true;
 					} else {
 						formData.enabled = true;
-						formData.failover = true;
 					}
 
 					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 c05c8ee..b18b1f1 100644
--- a/views/users-feature-call_forward.html
+++ b/views/users-feature-call_forward.html
@@ -56,6 +56,11 @@
 					<input type="checkbox" name="keep_caller_id"{{#if call_forward.keep_caller_id}} checked{{/if}}></input>
 				{{/monsterCheckbox}}
 			</label>
+			<label class="fix-left">
+				{{#monsterCheckbox i18n.users.call_forward.failover}}
+					<input type="checkbox" name="failover"{{#if call_forward.failover}} checked{{/if}}></input>
+				{{/monsterCheckbox}}
+			</label>
 		</form>
 
 		{{#if extra.timeoutTooShort}}