diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index fbee9061d..83ac79286 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -96,6 +96,12 @@ if(isset($_POST['updateprefs']))
 		$mes->addError(PRFLAN_211);
     }
 
+
+	if(!empty($_POST['passwordEncoding']) || !empty($_POST['ssl_enabled']))
+	{
+		$_POST['password_CHAP'] = 0; // disable chap unless using md5 without SSL.
+	}
+
 	// Table of range checking values - min and max for numerics. Only do the important ones
 	$pref_limits = array('loginname_maxlength' => array('min' => 10, 'max' => 100, 'default' => 30),
 					'displayname_maxlength' => array('min' => 5, 'max' => 100, 'default' => 15),
@@ -1427,7 +1433,10 @@ $text .= "
 	
 					$text .= "
 						<td><label for='password-chap'>".PRFLAN_178."</label></td>
-						<td>".$frm->select('password_CHAP',$CHAP_list,$pref['password_CHAP'] );
+						<td>";
+
+						$CHAPopt = !empty($pref['ssl_enabled']) || !empty($pref['passwordEncoding']) ? array('disabled'=>1) : null;
+						$text .=  $frm->select('password_CHAP',$CHAP_list,$pref['password_CHAP'], $CHAPopt );
 						//."	".$frm->select_open('password_CHAP');
 							
 						//TODO - user tracking session name - visible only if Cookie is enabled (JS)
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index a07af048b..705cdeebc 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1545,7 +1545,7 @@ body#admin-menus #sc-admin-help .panel-body {
 	overflow-y:scroll;
 	}
 
-
+.form-control[disabled] { opacity: 0.5; 	}
 
 
 
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index fc3292653..3394700e7 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -775,9 +775,13 @@ $(document).ready(function()
 		
 			$(selector).toggle();
 
+		//	$('.menu-selector input[type="checkbox"]').removeAttr("checked");
+
 			return false; 
 		});
 
+		
+
 
 		$(".e-mm-selector li input").click(function(e){