diff --git a/src/admin/charts.php b/src/admin/charts.php
index f52219b..818274a 100644
--- a/src/admin/charts.php
+++ b/src/admin/charts.php
@@ -514,6 +514,11 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) )
 			$myChart['cssclass'] = "line2";
 		$i++;
 		// --- 
+
+		// --- Check if Enable/Disable Button was clicked and add Autofocus code!
+		if ( isset($content['CHARTID']) && $content['CHARTID'] == $myChart['ID'] )
+			$content['EXTRA_JAVASCRIPT'] .= "<script>window.onload = function(){ document.getElementById('chartenablebutton" . $myChart['ID'] . "').focus(); };</script>"; 
+		// --- 
 	}
 	// --- 
 }
diff --git a/src/admin/users.php b/src/admin/users.php
index a10fa15..8acd5d2 100644
--- a/src/admin/users.php
+++ b/src/admin/users.php
@@ -449,6 +449,19 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) )
 		else
 			$content['USERS'][$i]['cssclass'] = "line2";
 		// --- 
+
+		// --- Check if Enable/Disable Button was clicked and add Autofocus code!
+		if (	isset($_GET['miniop']) && 
+				isset($content['USERID']) && 
+				$content['USERID'] == $content['USERS'][$i]['ID'] )
+		{
+			if ( $_GET['miniop'] == "setisadmin" ) 
+				$content['EXTRA_JAVASCRIPT'] .= "<script>window.onload = function(){ document.getElementById('userisadminbutton" . $content['USERS'][$i]['ID'] . "').focus(); };</script>"; 
+			else if ( $_GET['miniop'] == "setisreadonly" ) 
+				$content['EXTRA_JAVASCRIPT'] .= "<script>window.onload = function(){ document.getElementById('userisreadonlybutton" . $content['USERS'][$i]['ID'] . "').focus(); };</script>"; 
+		}
+		// --- 
+
 	}
 	// --- 
 }
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 005c476..cbc9a56 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -65,7 +65,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "4.1.2";
+$content['BUILDNUMBER'] = "4.1.3";
 $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt";
 $content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
diff --git a/src/templates/admin/admin_charts.html b/src/templates/admin/admin_charts.html
index 30df50b..66cf85c 100644
--- a/src/templates/admin/admin_charts.html
+++ b/src/templates/admin/admin_charts.html
@@ -43,7 +43,7 @@
 				<b>{DisplayName}</b>
 				<!-- ENDIF ActionsAllowed!="true" -->
 			</td>
-			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/charts.php?miniop=setenabled&id={ID}&newval={set_enabled}"><img src="{ChartEnabledImage}" width="16" align="center" title="{LN_CHARTS_SETENABLEDSTATE}"></a></td>
+			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/charts.php?miniop=setenabled&id={ID}&newval={set_enabled}" id="chartenablebutton{ID}"><img src="{ChartEnabledImage}" width="16" align="center" title="{LN_CHARTS_SETENABLEDSTATE}"></a></td>
 			<td align="left" class="{cssclass}"><img src="{ChartTypeImage}" width="16" align="left"> <b>{ChartTypeText}</b></td>
 			<td align="left" class="{cssclass}"><img src="{ChartAssignedToImage}" width="16" align="left"> <b>{ChartAssignedToText}</b></td>
 			<td align="center" class="{cssclass}">
diff --git a/src/templates/admin/admin_users.html b/src/templates/admin/admin_users.html
index 7ab4061..8fb9387 100644
--- a/src/templates/admin/admin_users.html
+++ b/src/templates/admin/admin_users.html
@@ -34,8 +34,8 @@
 		<tr>
 			<td align="center" class="{cssclass}"><b>{ID}</b></td>
 			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/users.php?op=edit&id={ID}">{username}</a></td>
-			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/users.php?miniop=setisadmin&id={ID}&newval={set_isadmin}"><img src="{is_isadmin_string}" width="16" title="{LN_USER_SETISADMIN}"></a></td>
-			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/users.php?miniop=setisreadonly&id={ID}&newval={set_isreadonly}"><img src="{is_readonly_string}" width="16" title="{LN_USER_SETISREADONLY}"></a></td>
+			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/users.php?miniop=setisadmin&id={ID}&newval={set_isadmin}" id="userisadminbutton{ID}"><img src="{is_isadmin_string}" width="16" title="{LN_USER_SETISADMIN}"></a></td>
+			<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/users.php?miniop=setisreadonly&id={ID}&newval={set_isreadonly}" id="userisreadonlybutton{ID}"><img src="{is_readonly_string}" width="16" title="{LN_USER_SETISREADONLY}"></a></td>
 			<td align="center" class="{cssclass}">
 				&nbsp;<a href="{BASEPATH}admin/users.php?op=edit&id={ID}"><img src="{MENU_EDIT}" width="16" title="{LN_USER_EDIT}"></a>
 				&nbsp;<a href="{BASEPATH}admin/users.php?op=delete&id={ID}"><img src="{MENU_DELETE}" width="16" title="{LN_USER_DELETE}"></a>