diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
index 96a405e1..79fc9e22 100644
--- a/lib/formfields/customer/domains/formfield.domains_add.php
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -63,8 +63,11 @@ return array(
 					'ssl_redirect' => array(
 						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
 						'label' => 'SSL Redirect',
-						'type' => 'yesno',
-						'yesno_var' => $ssl_redirect
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($result['ssl_redirect'])
 					),
 					'openbasedir_path' => array(
 						'label' => $lng['domain']['openbasedirpath'],
diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php
index ba551e8d..9f40dacb 100644
--- a/lib/formfields/customer/domains/formfield.domains_edit.php
+++ b/lib/formfields/customer/domains/formfield.domains_edit.php
@@ -63,20 +63,29 @@ return array(
 					'iswildcarddomain' => array(
 						'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false),
 						'label' => $lng['domains']['wildcarddomain'],
-						'type' => 'yesno',
-						'yesno_var' => $iswildcarddomain
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 					'isemaildomain' => array(
 						'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false),
 						'label' => 'Emaildomain',
-						'type' => 'yesno',
-						'yesno_var' => $isemaildomain
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($result['isemaildomain'])
 					),
 					'ssl_redirect' => array(
 						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
 						'label' => 'SSL Redirect',
-						'type' => 'yesno',
-						'yesno_var' => $ssl_redirect
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($result['ssl_redirect'])
 					),
 					'openbasedir_path' => array(
 						'label' => $lng['domain']['openbasedirpath'],
diff --git a/lib/formfields/customer/email/formfield.emails_add.php b/lib/formfields/customer/email/formfield.emails_add.php
index aa3c1cc5..55f9f37b 100644
--- a/lib/formfields/customer/email/formfield.emails_add.php
+++ b/lib/formfields/customer/email/formfield.emails_add.php
@@ -38,8 +38,11 @@ return array(
 					),
 					'pathedit' => array(
 						'label' => $lng['emails']['iscatchall'],
-						'type' => 'yesno',
-						'yesno_var' => $iscatchall
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					)
 				)
 			)
diff --git a/lib/formfields/customer/email/formfield.emails_addautoresponder.php b/lib/formfields/customer/email/formfield.emails_addautoresponder.php
index 69e2de66..dafd4d9b 100644
--- a/lib/formfields/customer/email/formfield.emails_addautoresponder.php
+++ b/lib/formfields/customer/email/formfield.emails_addautoresponder.php
@@ -31,8 +31,11 @@ return array(
 					),
 					'active' => array(
 						'label' => $lng['autoresponder']['active'],
-						'type' => 'yesno',
-						'yesno_var' => $isactive,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array('1')
 					),
 					'date_from' => array(
 						'label' => $lng['autoresponder']['date_from'] . " (dd-mm-yyyy)",
diff --git a/lib/formfields/customer/email/formfield.emails_editautoresponder.php b/lib/formfields/customer/email/formfield.emails_editautoresponder.php
index 62c85b4c..4f6ca5c6 100644
--- a/lib/formfields/customer/email/formfield.emails_editautoresponder.php
+++ b/lib/formfields/customer/email/formfield.emails_editautoresponder.php
@@ -31,8 +31,11 @@ return array(
 					),
 					'active' => array(
 						'label' => $lng['autoresponder']['active'],
-						'type' => 'yesno',
-						'yesno_var' => $isactive,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($row['enabled'])
 					),
 					'date_from' => array(
 						'label' => $lng['autoresponder']['date_from'] . " (dd-mm-yyyy)",
diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php
index d0bc1f39..892ee71c 100644
--- a/lib/formfields/customer/extras/formfield.htaccess_add.php
+++ b/lib/formfields/customer/extras/formfield.htaccess_add.php
@@ -33,8 +33,11 @@ return array(
 					),
 					'options_indexes' => array(
 						'label' => $lng['extras']['directory_browsing'],
-						'type' => 'yesno',
-						'yesno_var' => $options_indexes
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 					'error404path' => array(
 						'label' => $lng['extras']['errordocument404path'],
@@ -56,8 +59,11 @@ return array(
 					'options_cgi' => array(
 						'visible' => ($cperlenabled == 1),
 						'label' => $lng['extras']['execute_perl'],
-						'type' => 'yesno',
-						'yesno_var' => $options_cgi
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					)
 				)
 			)
diff --git a/lib/formfields/customer/extras/formfield.htaccess_edit.php b/lib/formfields/customer/extras/formfield.htaccess_edit.php
index 216a6114..d9020ff3 100644
--- a/lib/formfields/customer/extras/formfield.htaccess_edit.php
+++ b/lib/formfields/customer/extras/formfield.htaccess_edit.php
@@ -31,8 +31,11 @@ return array(
 					),
 					'options_indexes' => array(
 						'label' => $lng['extras']['directory_browsing'],
-						'type' => 'yesno',
-						'yesno_var' => $options_indexes
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($result['options_indexes'])
 					),
 					'error404path' => array(
 						'label' => $lng['extras']['errordocument404path'],
@@ -57,8 +60,11 @@ return array(
 					'options_cgi' => array(
 						'visible' => ($cperlenabled == 1),
 						'label' => $lng['extras']['execute_perl'],
-						'type' => 'yesno',
-						'yesno_var' => $options_cgi
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($result['options_cgi'])
 					)
 				)
 			)
diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php
index 23039a30..bdd28d89 100644
--- a/lib/formfields/customer/ftp/formfield.ftp_add.php
+++ b/lib/formfields/customer/ftp/formfield.ftp_add.php
@@ -47,8 +47,11 @@ return array(
 					),
 					'sendinfomail' => array(
 						'label' => $lng['customer']['sendinfomail'],
-						'type' => 'yesno',
-						'yesno_var' => $sendinfomail,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 				)
 			)
diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php
index adb166fb..fdd45293 100644
--- a/lib/formfields/customer/mysql/formfield.mysql_add.php
+++ b/lib/formfields/customer/mysql/formfield.mysql_add.php
@@ -39,8 +39,11 @@ return array(
 					),
 					'sendinfomail' => array(
 						'label' => $lng['customer']['sendinfomail'],
-						'type' => 'yesno',
-						'yesno_var' => $sendinfomail,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					)
 				)
 			)