diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIFans.page b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIFans.page
index 93d8680e..a15d39eb 100644
--- a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIFans.page
+++ b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIFans.page
@@ -3,12 +3,12 @@ Title="Fan Control"
 ---
 <form markdown="1" name="ipmifan_settings" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="ipmitool-plugin/ipmitool-plugin.cfg" />
-<input type="hidden" id="command" name="#command" value="" />
+<input type="hidden" id="FANCMD" name="#command" value="" />
 
 IPMI Fan Control:
-: <select name="service" size="1">
-  <?=mk_option($cfg['service'], "0", "No")?>
-  <?=mk_option($cfg['service'], "1", "Yes")?>
+: <select name="IPMIFAN" size="1">
+  <?=mk_option($ipmifan, "disable", "No")?>
+  <?=mk_option($ipmifan, "enable", "Yes")?>
   </select>
 
 &nbsp;
@@ -16,20 +16,21 @@ IPMI Fan Control:
 <?php if ($fans[0]): ?>
 
 <?=$fans[0];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[0];?>">
+: <select name="FAN_<?=$fans[0];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors, 'Temperature', $cfg['FAN_'.$fans[0]], true);?>
 	</select>
 
 <?=$fans[0];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[0];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[0];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[0]]);?>
 	</select>
 
 <?=$fans[0];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[0];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[0];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[0]]);?>
 	</select>
 
 &nbsp;
@@ -39,20 +40,21 @@ IPMI Fan Control:
 <?php if ($fans[1]): ?>
 
 <?=$fans[1];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[1];?>">
+: <select name="FAN_<?=$fans[1];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[1]], true);?>
 	</select>
 
 <?=$fans[1];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[1];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[1];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[1]]);?>
 	</select>
 
 <?=$fans[1];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[1];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[1];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[1]]);?>
 	</select>
 
 &nbsp;
@@ -62,20 +64,21 @@ IPMI Fan Control:
 <?php if ($fans[2]): ?>
 
 <?=$fans[2];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[2];?>">
+: <select name="FAN_<?=$fans[2];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[2]], true);?>
 	</select>
 
 <?=$fans[2];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[2];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[2];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[2]]);?>
 	</select>
 
 <?=$fans[2];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[2];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[2];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[2]]);?>
 	</select>
 
 &nbsp;
@@ -85,20 +88,21 @@ IPMI Fan Control:
 <?php if ($fans[3]): ?>
 
 <?=$fans[3];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[3];?>">
+: <select name="FAN_<?=$fans[3];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[3]], true);?>
 	</select>
 
 <?=$fans[3];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[3];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[3];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[3]]);?>
 	</select>
 
 <?=$fans[3];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[3];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[3];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[3]]);?>
 	</select>
 
 &nbsp;
@@ -108,20 +112,21 @@ IPMI Fan Control:
 <?php if ($fans[4]): ?>
 
 <?=$fans[4];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[4];?>">
+: <select name="FAN_<?=$fans[4];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[4]], true);?>
 	</select>
 
 <?=$fans[4];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[4];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[4];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[4]]);?>
 	</select>
 
 <?=$fans[4];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[4];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[4];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[4]]);?>
 	</select>
 
 &nbsp;
@@ -131,20 +136,21 @@ IPMI Fan Control:
 <?php if ($fans[5]): ?>
 
 <?=$fans[5];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[5];?>">
+: <select name="FAN_<?=$fans[5];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[5]], true);?>
 	</select>
 
 <?=$fans[5];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[5];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[5];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[5]]);?>
 	</select>
 
 <?=$fans[5];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[5];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[5];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[5]]);?>
 	</select>
 
 &nbsp;
@@ -154,20 +160,21 @@ IPMI Fan Control:
 <?php if ($fans[6]): ?>
 
 <?=$fans[6];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[6];?>">
+: <select name="FAN_<?=$fans[6];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[6]], true);?>
 	</select>
 
 <?=$fans[6];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[6];?>_LOW">
+: <select name="<FAN_LOW_<?=$fans[6];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[6]]);?>
 	</select>
 
 <?=$fans[6];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[6];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[6];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[6]]);?>
 	</select>
 
 &nbsp;
@@ -177,20 +184,21 @@ IPMI Fan Control:
 <?php if ($fans[7]): ?>
 
 <?=$fans[7];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[7];?>">
+: <select name="FAN_<?=$fans[7];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[7]], true);?>
 	</select>
 
 <?=$fans[7];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[7];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[7];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[7]]);?>
 	</select>
 
 <?=$fans[7];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[7];?>_HIGH">
+: <select name="<FAN_HIGH_<?=$fans[7];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[7]]);?>
 	</select>
 
 &nbsp;
@@ -200,20 +208,21 @@ IPMI Fan Control:
 <?php if ($fans[8]): ?>
 
 <?=$fans[8];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[8];?>">
+: <select name="FAN_<?=$fans[8];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[8]], true);?>
 	</select>
 
 <?=$fans[8];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[8];?>_LOW">
+: <select name="FAN_LOW_<?=$fans[8];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[8]]);?>
 	</select>
 
 <?=$fans[8];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[8];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[8];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[8]]);?>
 	</select>
 
 &nbsp;
@@ -223,20 +232,21 @@ IPMI Fan Control:
 <?php if ($fans[9]): ?>
 
 <?=$fans[9];?> temperature sensor:
-: <select name="<?='FAN_'.$fans[9];?>">
+: <select name="FAN_<?=$fans[9];?>">
 		<option value='0'>Auto</option>
-		<?=ipmi_get_options($sensors, 'Temperature');?>
-		<option value='HDD'>HDD Temperatures</option>
+		<?=ipmi_get_options($sensors,  'Temperature', $cfg['FAN_'.$fans[9]], true);?>
 	</select>
 
 <?=$fans[9];?> Low temperature threshold:
-: <select name="<?='FAN_'.$fans[9];?>_LOW">
+: <select name="<FAN_LOW_<?=$fans[9];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('LOW', $cfg['FAN_LOW_'.$fans[9]]);?>
 	</select>
 
 <?=$fans[9];?> High temperature threshold:
-: <select name="<?='FAN_'.$fans[9];?>_HIGH">
+: <select name="FAN_HIGH_<?=$fans[9];?>">
 		<option value='0'>Auto</option>
+		<?=temp_get_options('HIGH', $cfg['FAN_HIGH_'.$fans[9]]);?>
 	</select>
 
 <?php endif; ?>
@@ -246,3 +256,29 @@ IPMI Fan Control:
 <input id="FAN_DEFAULT" class="ipmifan-run" type="button" value="Default" onClick="resetFANDATA(this.form);">
 : <input id="btnFANApply" type="submit" value="Apply" onClick="verifyFANDATA(this.form)"><input type="button" value="Done" onClick="done()">
 </form>
+
+<script type="text/javascript">
+function resetFANDATA(form) {
+		form.submit();
+}
+
+function checkIPMIFAN(form) {
+	if ("<?=$ipmifan_running;?>" == true)
+	{
+		$(".ipmifan-run").prop("disabled", true);
+		form.btnFANApply.disabled = "disabled";
+   }else{
+   	$(".ipmifan-run").prop("disabled", false);
+		$("#btnFANApply").prop("disabled", false);
+	}
+	if (form.IPMIFAN.value == "enable")
+		form.FANCMD.value = "/usr/local/emhttp/plugins/ipmitool-plugin/scripts/fancontrol_start";
+	else {
+		form.FANCMD.value = "/usr/local/emhttp/plugins/ipmitool-plugin/scripts/fabcontrol_stop";
+	}
+}
+
+function verifyFANDATA(form) {
+	form.IPMIFAN.value = form.IPMIFAN.value.replace(/ /g,"_");
+}
+</script>
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page
index 01c2ecb8..42a6d8b3 100644
--- a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page
+++ b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page
@@ -9,7 +9,7 @@ require_once '/usr/local/emhttp/plugins/ipmitool-plugin/include/ipmitool_helpers
 
 <form markdown="1" name="ipmitool_settings" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="ipmitool-plugin/ipmitool-plugin.cfg" />
-<input type="hidden" id="command" name="#command" value="" />
+<input type="hidden" id="COMMAND" name="#command" value="" />
 
 Enable Event Notifications:
 : <select id="IPMIEVD" name="IPMIEVD" size="1" onChange="checkIPMIEVD(this.form);">
@@ -45,7 +45,7 @@ Display Motherboard temperature:
 	</select>
 
 Display Fan speed:
-: <select name="IPMI_FAN">
+: <select name="DISP_FAN">
 		<option value='false'>None</option>
 		<?=ipmi_get_options($sensors, 'Fan', $fan);?>
 	</select>
@@ -60,6 +60,7 @@ $(function(){
 		.append("<span class='status'>Fan Control: <?=$ipmifan_status;?> </span>")
 		.append("<span class='status'>Event Notification: <?=$ipmievd_status;?> </span>");
 	checkIPMIEVD(document.ipmitool_settings);
+	//checkIPMIFAN(document.ipmifan_settings);
 	checkREMOTE(document.ipmitool_settings);
 	decData(document.ipmitool_settings);
 	//ip address input mask
@@ -71,6 +72,9 @@ function resetDATA(form) {
 	form.IPADDR.value = "";
 	form.USER.value = "";
 	form.PASSWORD.value = "";
+	form.CPU_TEMP.selectedIndex = 0;
+	form.MB_TEMP.selectedIndex = 0;
+	form.DISP_FAN.selectedIndex = 0;
 	form.submit();
 }
 
@@ -84,9 +88,9 @@ function checkIPMIEVD(form) {
 		$("#btnApply").prop("disabled", false);
 	}
 	if (form.IPMIEVD.value == "enable")
-		form.command.value = "/usr/local/emhttp/plugins/ipmitool-plugin/scripts/start";
+		form.COMMAND.value = "/usr/local/emhttp/plugins/ipmitool-plugin/scripts/start";
 	else {
-		form.command.value = "/usr/local/emhttp/plugins/ipmitool-plugin/scripts/stop";
+		form.COMMAND.value = "/usr/local/emhttp/plugins/ipmitool-plugin/scripts/stop";
 	}
 }
 
@@ -108,4 +112,5 @@ function verifyDATA(form) {
 	form.USER.value = form.USER.value.replace(/ /g,"_");
 	form.PASSWORD.value = btoa(form.PASSWORD.value);
 }
-</script>
\ No newline at end of file
+
+</script>
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/include/ipmitool_helpers.php b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/include/ipmitool_helpers.php
index 0c9f99b0..d352f8af 100644
--- a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/include/ipmitool_helpers.php
+++ b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/include/ipmitool_helpers.php
@@ -88,7 +88,9 @@ function ipmi_events($options=null){
 }
 
 /* get select options for a given sensor type */
-function ipmi_get_options($sensors, $type, $selected=null){
+function ipmi_get_options($sensors, $type, $selected=null, $hdd=null){
+	if ($hdd)
+		$sensors[] = ['Name' => 'HDD Temperature', 'Type' => 'Temperature', 'Status' => 'ok'];
 	$options = "";
 	foreach($sensors as $sensor){
 		if ($sensor["Type"] == $type && $sensor["Status"] != "ns"){
@@ -105,6 +107,25 @@ function ipmi_get_options($sensors, $type, $selected=null){
 	return $options;
 }
 
+// get options for high or low temp thresholds
+function temp_get_options($range, $selected=null){
+	$temps = [20,25,30,35,40,45,50,55,60,65,70,75,80];
+	if ($range == 'HIGH')
+	  rsort($temps);
+ $options = "";
+ foreach($temps as $temp){
+			$options .= "<option value='$temp'";
+
+			// set saved option as selected
+			if ($selected == $temp)
+				$options .= " selected";
+
+		$options .= ">$temp</option>";
+
+ 	}
+ 	return $options;
+	}
+
 /* get reading for a given sensor by name */
 function ipmi_get_reading($names, $options=null) {
 	$readings = [];
@@ -133,4 +154,5 @@ function ipmi_get_fans($sensors){
 	}
 	return $fans;
 }
-?>
+
+?>
\ No newline at end of file