diff --git a/configs/menu.conf b/configs/menu.conf
index a167e475..5aef5b60 100644
--- a/configs/menu.conf
+++ b/configs/menu.conf
@@ -43,5 +43,4 @@ url_search = list-virtual.php
 form_search = <form name="search" method="post" action="list-virtual.php"><input name="search" size="10" /></form>
 
 [adminlistadmin]
-url_edit_active_admin = edit-active-admin.php
 url_edit_admin = edit.php?table=admin
diff --git a/edit-active-admin.php b/edit-active-admin.php
deleted file mode 100644
index 8af2952e..00000000
--- a/edit-active-admin.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at : 
- *     http://www.postfixadmin.com or http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: edit-active-admin.php 
- * Edit an active administrator. This is used as a 'toggle' page from list-admin.
- *
- * Template File: message.tpl
- *
- * Template Variables:
- *
- * none
- *
- * Form POST \ GET Variables:
- *
- * fUsername
- */
-
-require_once('common.php');
-
-authentication_require_role('global-admin');
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-   if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
-
-   $sqlSet='active=1-active';
-   if ('pgsql'==$CONF['database_type']) $sqlSet='active=NOT active';
-
-   $result = db_query ("UPDATE $table_admin SET $sqlSet,modified=NOW() WHERE username='$fUsername'");
-   if ($result['rows'] != 1)
-   {
-      $error = 1;
-      flash_error($PALANG['pAdminEdit_admin_result_error']);
-   }
-   
-   if ($error != 1)
-   {
-      header ("Location: list-admin.php");
-      exit;
-   }
-}
-$smarty->assign ('smarty_template', 'message');
-$smarty->display ('index.tpl');
-
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-
-?>
diff --git a/templates/adminlistadmin.tpl b/templates/adminlistadmin.tpl
index 8963a08b..a1be33ed 100644
--- a/templates/adminlistadmin.tpl
+++ b/templates/adminlistadmin.tpl
@@ -18,7 +18,7 @@
 				{/if}
 			</td>
 			<td>{$admin.modified}</td>
-			<td><a href="{#url_edit_active_admin#}&edit={$admin.username|escape:"url"}">{$admin._active}</a></td>
+			<td><a href="{#url_edit_admin#}&amp;edit={$admin.username|escape:"url"}&amp;active={if ($admin.active==0)}1{else}0{/if}">{$admin._active}</a></td>
 			<td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
 			<td><a href="{#url_delete#}?table=admin&amp;delete={$admin.username|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pAdminList_admin_username}: {$admin.username}');">{$PALANG.del}</a></td>
 		</tr>