diff --git a/src/admin/index.php b/src/admin/index.php
index 0eafe08..a7451a7 100644
--- a/src/admin/index.php
+++ b/src/admin/index.php
@@ -94,10 +94,23 @@ if ( isset($_GET['op']) && isset($_GET['value']) )
 	{
 		$iNewVal = intval($_GET['value']);
 		if ( $iNewVal == 1 )
+		{
+			// Set UserOption 
 			$USERCFG['UserOverwriteOptions'] = 1;
+
+			// Add some javascript to FOcus the enable/disable user button
+			$content['EXTRA_JAVASCRIPT'] .= "<script>window.onload = function(){ document.getElementById('buttonenableuseropt').focus(); };</script>"; 
+		}
 		else
+		{
+			// Set UserOption 
 			$USERCFG['UserOverwriteOptions'] = 0;
 
+			// Add some javascript to FOcus the enable/disable user button
+			$content['EXTRA_JAVASCRIPT'] .= "<script>window.onload = function(){ document.getElementById('buttondisableuseropt').focus(); };</script>"; 
+		}
+
+
 		// Enable User Options!
 		WriteConfigValue( "UserOverwriteOptions", false, $content['SESSION_USERID'] );
 	}
diff --git a/src/templates/admin/admin_index.html b/src/templates/admin/admin_index.html
index 476264a..af98c2b 100644
--- a/src/templates/admin/admin_index.html
+++ b/src/templates/admin/admin_index.html
@@ -23,7 +23,7 @@
 </br>
 <!-- ENDIF isupdateavailable="true" -->
 	
-<form action="" method="post">
+<form action="" method="post" name="mainform">
 	<table border="0" cellpadding="1" cellspacing="1" width="80%" align="center" class="table_with_border">
 	<tr>
 		<td colspan="2">&nbsp;</td>