diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php
index ffe29cb2b3..de9ef97118 100755
--- a/src/usr/local/www/diag_reboot.php
+++ b/src/usr/local/www/diag_reboot.php
@@ -77,7 +77,7 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Reboot"));
 include("head.inc");
 
 
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+if (($_SERVER['REQUEST_METHOD'] == 'POST') && ($_POST['override'] != "yes")) {
 	if (DEBUG) {
 		print_info_box(gettext("Not actually rebooting (DEBUG is set true)."), 'success');
 	} else {
@@ -156,6 +156,16 @@ events.push(function() {
 	</div>
 </div>
 
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	//If we have been called with $_POST['override'] == "yes", then just reload the page to simulate the user clicking "Reboot"
+	if ( "<?=$_POST['override']?>" == "yes") {
+		$('form').submit();
+	}
+});
+//]]>
+</script>
 <?php
 
 }
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index ddec186677..50c2e8d08d 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -114,7 +114,6 @@ $thermal_hardware_modules = array(
 	'amdtemp' => gettext("AMD K8, K10 and K11 CPU on-die thermal sensor"));
 
 if ($_POST) {
-
 	unset($input_errors);
 	$pconfig = $_POST;
 
@@ -525,8 +524,8 @@ $section->addInput(new Form_Checkbox(
 	($pconfig['use_mfs_tmpvar'] || $g['platform'] != $g['product_name'])
 ))->setHelp('Set this to use /tmp and /var as RAM disks (memory file '.
 	'system disks) on a full install rather than use the hard disk. Setting this will '.
-	'cause the data in /tmp and /var to be lost at reboot, including log data. RRD '.
-	'and DHCP Leases will be retained.');
+	'cause the data in /tmp and /var to be lost, including log data. RRD '.
+	'and DHCP Leases will be retained. Changing this setting will cause the firewall to reboot after clicking "Save".');
 
 $section->addInput(new Form_Input(
 	'use_mfs_tmp_size',
@@ -598,4 +597,35 @@ $form->add($section);
 
 print $form;
 
+$ramdisk_msg = gettext('The \"Use Ramdisk\" setting has been changed. This will cause the firewall\nto reboot immediately after the new setting is saved.\n\nPlease confirm.');?>
+
+<script>
+//<![CDATA[
+events.push(function() {
+	// Record the state of the Ue Ramsidk checkbox on page load
+	use_ramdisk = $('#use_mfs_tmpvar').prop('checked');
+
+	$('form').submit(function(event) {
+		// Has the Use ramdisk checkbox changes state?
+		if ($('#use_mfs_tmpvar').prop('checked') != use_ramdisk) {
+			if (confirm("<?=$ramdisk_msg?>")) {
+				$('form').append('<input type="hidden" name="doreboot" id="doreboot" value="yes"/>');
+			} else {
+				event.preventDefault();
+			}
+		}
+	});
+
+    drb = "<?=$pconfig['doreboot']?>";
+
+	if (drb == "yes") {
+		$('form').append("<input type=\"hidden\" name=\"override\" value=\"yes\" />");
+		$('form').get(0).setAttribute('action', 'diag_reboot.php');
+		$(form).submit();
+	}
+});
+//]]>
+</script>
+
+<?php
 include("foot.inc");