diff --git a/configs/menu.conf b/configs/menu.conf
index c9693b47..16368460 100644
--- a/configs/menu.conf
+++ b/configs/menu.conf
@@ -1,7 +1,7 @@
 url_main = main.php
 # list_admin
 url_list_admin = list-admin.php
-url_create_admin = create-admin.php
+url_create_admin = edit.php?table=admin
 # list-domain
 url_list_domain = list-domain.php
 url_edit_domain = edit.php?table=domain
@@ -44,7 +44,7 @@ form_search = <form name="search" method="post" action="list-virtual.php"><input
 
 [adminlistadmin]
 url_edit_active_admin = edit-active-admin.php
-url_edit_admin = edit-admin.php
+url_edit_admin = edit.php?table=admin
 
 [adminlistdomain]
 url_edit_active_domain = edit-active-domain.php
diff --git a/templates/adminlistadmin.tpl b/templates/adminlistadmin.tpl
index 4e570a56..8963a08b 100644
--- a/templates/adminlistadmin.tpl
+++ b/templates/adminlistadmin.tpl
@@ -18,8 +18,8 @@
 				{/if}
 			</td>
 			<td>{$admin.modified}</td>
-			<td><a href="{#url_edit_active_admin#}?username={$admin.username|escape:"url"}">{$admin._active}</a></td>
-			<td><a href="{#url_edit_admin#}?username={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
+			<td><a href="{#url_edit_active_admin#}&edit={$admin.username|escape:"url"}">{$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>
 {/foreach}