diff --git a/views/users-feature-call_forward.html b/views/users-feature-call_forward.html
index 528bca4..c05c8ee 100644
--- a/views/users-feature-call_forward.html
+++ b/views/users-feature-call_forward.html
@@ -6,9 +6,9 @@
 		{{ i18n.users.call_forward.headline }}
 
 		<div class="btn-group feature-select-mode">
-			<button data-value="on" class="monster-button monster-button-fit{{#compare extra.callForwardMode "===" "on"}} monster-button-primary selected{{/compare}}">On</button>
-			<button data-value="failover" class="monster-button monster-button-fit{{#compare extra.callForwardMode "===" "failover"}} monster-button-primary selected{{/compare}}">Failover Mode</button>
 			<button data-value="off" class="monster-button monster-button-fit{{#compare extra.callForwardMode "===" "off"}} monster-button-primary selected{{/compare}}">Off</button>
+			<button data-value="failover" class="monster-button monster-button-fit{{#compare extra.callForwardMode "===" "failover"}} monster-button-primary selected{{/compare}}">Failover Mode</button>
+			<button data-value="on" class="monster-button monster-button-fit{{#compare extra.callForwardMode "===" "on"}} monster-button-primary selected{{/compare}}">On</button>
 		</div>
 	</div>
 
diff --git a/views/users-feature-call_recording.html b/views/users-feature-call_recording.html
index 3331598..78cb071 100644
--- a/views/users-feature-call_recording.html
+++ b/views/users-feature-call_recording.html
@@ -16,36 +16,36 @@
 			<div class="btn-group-wrapper">
 				<span class="title">{{ i18n.users.callRecording.toggleValues.inboundOnnet.title }}</span>
 				<div class="btn-group call-recording-type" data-type="inbound-onnet">
-					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.inbound.onnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
-					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.inbound.onnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.inbound.onnet.accountValue }})</button>
 					<button data-value="off" class="monster-button monster-button-fit{{#compare extra.inbound.onnet.enabled "===" false}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.off }}</button>
+					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.inbound.onnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.inbound.onnet.accountValue }})</button>
+					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.inbound.onnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
 				</div>
 			</div>
 
 			<div class="btn-group-wrapper">
 				<span class="title">{{ i18n.users.callRecording.toggleValues.inboundOffnet.title }}</span>
 				<div class="btn-group call-recording-type" data-type="inbound-offnet">
-					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.inbound.offnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
-					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.inbound.offnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.inbound.offnet.accountValue }})</button>
 					<button data-value="off" class="monster-button monster-button-fit{{#compare extra.inbound.offnet.enabled "===" false}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.off }}</button>
+					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.inbound.offnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.inbound.offnet.accountValue }})</button>
+					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.inbound.offnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
 				</div>
 			</div>
 
 			<div class="btn-group-wrapper">
 				<span class="title">{{ i18n.users.callRecording.toggleValues.outboundOnnet.title }}</span>
 				<div class="btn-group call-recording-type" data-type="outbound-onnet">
-					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.outbound.onnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
-					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.outbound.onnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.outbound.onnet.accountValue }})</button>
 					<button data-value="off" class="monster-button monster-button-fit{{#compare extra.outbound.onnet.enabled "===" false}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.off }}</button>
+					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.outbound.onnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.outbound.onnet.accountValue }})</button>
+					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.outbound.onnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
 				</div>
 			</div>
 
 			<div class="btn-group-wrapper">
 				<span class="title">{{ i18n.users.callRecording.toggleValues.outboundOffnet.title }}</span>
 				<div class="btn-group call-recording-type" data-type="outbound-offnet">
-					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.outbound.offnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
-					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.outbound.offnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.outbound.offnet.accountValue }})</button>
 					<button data-value="off" class="monster-button monster-button-fit{{#compare extra.outbound.offnet.enabled "===" false}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.off }}</button>
+					<button data-value="default" class="monster-button monster-button-fit{{#compare extra.outbound.offnet.enabled "===" "default"}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.accountDefault }} ({{ extra.outbound.offnet.accountValue }})</button>
+					<button data-value="on" class="monster-button monster-button-fit{{#compare extra.outbound.offnet.enabled "===" true}} monster-button-primary selected{{/compare}}">{{ i18n.users.callRecording.toggleValues.on }}</button>
 				</div>
 			</div>