diff --git a/CONTROL/control b/CONTROL/control
index af68684e..2c74dd32 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.3-3
+Version: 0.9.3-4
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file
diff --git a/var/mongoose/cgi-bin/cfwreset b/var/mongoose/cgi-bin/cfwreset
deleted file mode 100755
index 0507f8e6..00000000
--- a/var/mongoose/cgi-bin/cfwreset
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "Content-Type: text/plain"
-echo
-
-/bin/rm -rf /mod/*
-
diff --git a/var/mongoose/cgi-bin/cfwreset.cgi b/var/mongoose/cgi-bin/cfwreset.cgi
new file mode 100755
index 00000000..9ebfce47
--- /dev/null
+++ b/var/mongoose/cgi-bin/cfwreset.cgi
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "Content-Type: text/plain"
+echo
+
+touch /var/lib/humaxtv/mod/_RESET_CUSTOM_FIRMWARE_ENVIRONMENT
+
diff --git a/var/mongoose/html/diag/diag.jim b/var/mongoose/html/diag/diag.jim
index 85e7c392..269ee941 100755
--- a/var/mongoose/html/diag/diag.jim
+++ b/var/mongoose/html/diag/diag.jim
@@ -43,12 +43,34 @@ puts {
 
 <tr>
 <td colspan=2>
-<button id=runreset style="width: 100%">
+<button id=runreset style="width: 100%"
+}
+
+if {[system modversion 1] < 200} {
+	puts -nonewline " disabled class=ui-state-disabled"
+}
+
+puts {
+>
 Remove all custom firmware packages and settings 
 </button>
+}
+
+if {[system modversion 1] < 200} {
+	puts {
 <div class=footnote style="text-align: center">
-(This option will return with firmware 2.00)
+(Install custom firmware v2.00 to enable this option)
 </div>
+	}
+}
+
+puts {
+
+<div id=resetdone class="hidden blood">
+Restart your Humax with the remote control.<br>
+Allow it to turn off completely before restarting.<br>
+</div>
+
 </td>
 </tr>
 
diff --git a/var/mongoose/html/diag/script.js b/var/mongoose/html/diag/script.js
index 6497f9d9..0f3f8d77 100644
--- a/var/mongoose/html/diag/script.js
+++ b/var/mongoose/html/diag/script.js
@@ -39,7 +39,20 @@ $('#runedit').click(function(e) {
 	window.location = '/edit/edit.jim';
 });
 
-$('#runreset').disable();
+$('#runreset').click(function(e) {
+	e.preventDefault();
+	if (!confirm('Are you sure? This will completely remove all packages and settings.'))
+		return;
+	if (!confirm('Are you really sure?'))
+		return;
+	if (!confirm('One last time, are you sure?'))
+		return;
+	$.get('/cgi-bin/cfwreset.cgi', function() {
+		$('button').disable();
+		$('#resetdone').slideDown();
+	});
+});
 
 });
 
+