diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 3c6f9d09e..aaba750d4 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2322,16 +2322,15 @@ class e_form
 			$options_off = array_merge($options, array('class' => 'e-expandit-off'));
 		}
 
-		if(deftrue('e_DEBUG') && e_ADMIN_AREA === true && empty($label_enabled) && empty($label_disabled))
+		if(deftrue('e_DEBUG') && e_ADMIN_AREA === true)
 		{
 			$options['switch'] = 'small';
 			$options['wrapperClass'] = 'wrapper form-control';
-			$label_enabled = strtoupper(LAN_ON);
-			$label_disabled = strtoupper(LAN_OFF);
+			$label_enabled = ($label_enabled) ? strtoupper($label_enabled) : strtoupper(LAN_ON);
+			$label_disabled = ($label_disabled) ?  strtoupper($label_disabled): strtoupper(LAN_OFF);
 
 		}
-
-
+		
 		$options_on['label'] = $label_enabled ? defset($label_enabled, $label_enabled) : LAN_ENABLED;
 		$options_off['label'] = $label_disabled ? defset($label_disabled, $label_disabled) : LAN_DISABLED;
 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 2036e8b37..dd24a15ec 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -223,6 +223,7 @@ a.tweet_action				{ font-size:8px }
 
 .bootstrap-switch .bootstrap-switch-label { background: inherit }
 .bootstrap-switch.form-control { padding:0; height:auto }
+td.center .bootstrap-switch.form-control { margin-left: auto; margin-right: auto; }
 
 
 /*