diff --git a/admin/inc/class.admin_accesslog.inc.php b/admin/inc/class.admin_accesslog.inc.php
index e60a07c809..614102644d 100644
--- a/admin/inc/class.admin_accesslog.inc.php
+++ b/admin/inc/class.admin_accesslog.inc.php
@@ -93,22 +93,14 @@ class admin_accesslog
 			// eg. for bad login or password
 			if (!$row['account_id']) $row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
 
-			$readonlys['kill['.$row['sessionid'].']'] = $no_kill;
-			$readonlys['delete['.$row['sessionid'].']'] = $query['session_list'];
-
 			// do not allow to kill or select own session
 			if ($GLOBALS['egw']->session->sessionid_access_log == $row['sessionid'] && $query['session_list'])
 			{
-				$readonlys['kill['.$row['sessionid'].']'] = $readonlys['selected['.$row['sessionid'].']'] = true;
-				$readonlys["kill[$row[sessionid]]"]= true;
 				$row['class'] .= ' rowNoDelete ';
 			}
 			// do not allow to delete access log off active sessions
 			if (!$row['lo'] && $row['session_dla'] > time()-$GLOBALS['egw_info']['server']['sessions_timeout'] && !$query['session_list'])
 			{
-				$readonlys['delete['.$row['sessionid'].']'] = $readonlys['selected['.$row['sessionid'].']'] = true;
-
-				$readonlys["delete[$row[sessionid]]"]= true;
 				$row['class'] .= ' rowNoDelete ';
 			}
 			unset($row['session_php']);	// for security reasons, do NOT give real PHP sessionid to UI
@@ -314,6 +306,7 @@ class admin_accesslog
 					'confirm' => 'Kill this session',
 					'confirm_multiple' => 'Kill these sessions',
 					'group' => $group,
+					'disableClass' => 'rowNoDelete',
 				),
 			);
 
diff --git a/admin/templates/default/accesslog.xet b/admin/templates/default/accesslog.xet
index 570ff04f56..1648222d5b 100644
--- a/admin/templates/default/accesslog.xet
+++ b/admin/templates/default/accesslog.xet
@@ -26,7 +26,7 @@
 					<nextmatch-sortheader label="Idle" id="session_dla"/>
 					<nextmatch-sortheader label="User-Agent" id="user_agent"/>
 				</row>
-				<row class="row">
+				<row class="row $row_cont[class]">
 					<hbox>
 						<menulist>
 							<menupopup type="select-account" label="" id="${row}[account_id]" readonly="true"/>