diff --git a/configs/menu.conf b/configs/menu.conf
index 5aef5b60..e3ae07cf 100644
--- a/configs/menu.conf
+++ b/configs/menu.conf
@@ -33,8 +33,6 @@ url_user_password = password.php
 url_user_logout = logout.php
 
 
-url_edit_active = edit-active.php
-
 tr_header = <tr class="header">
 tr_hilightoff = <tr class="hilightoff" onmouseover="className='hilighton';" onmouseout="className='hilightoff';">
 
diff --git a/edit-active.php b/edit-active.php
index 4d1f4242..5c939dca 100644
--- a/edit-active.php
+++ b/edit-active.php
@@ -32,7 +32,6 @@ require_once('common.php');
 authentication_require_role('admin');
 $SESSID_USERNAME = authentication_get_username();
 
-$fAliasDomain = '';
 $fUsername    = '';
 $fAlias       = '';
 $fDomain      = '';
@@ -40,7 +39,6 @@ $fReturn      = '';
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
-   if (isset ($_GET['alias_domain'])) $fAliasDomain = escape_string ($_GET['alias_domain']);
    if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
    if (isset ($_GET['alias'])) $fAlias = escape_string ($_GET['alias']); else $fAlias = escape_string ($_GET['username']);
    if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
@@ -81,19 +79,6 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
             db_log ($fDomain, 'edit_alias_state', $fAlias);
          }
       }
-      if ($fAliasDomain != '')
-      {
-         $result = db_query ("UPDATE $table_alias_domain SET $setSql WHERE alias_domain='$fDomain'");
-         if ($result['rows'] != 1)
-         {
-            $error = 1;
-            flash_error($PALANG['pEdit_alias_domain_result_error']);
-         }
-         else
-         {
-            db_log ($fDomain, 'edit_alias_domain_state', $fDomain);
-         }
-      }
    }
 
    if ($error != 1)
diff --git a/templates/list-virtual_alias_domain.tpl b/templates/list-virtual_alias_domain.tpl
index dcf36002..c3588d91 100644
--- a/templates/list-virtual_alias_domain.tpl
+++ b/templates/list-virtual_alias_domain.tpl
@@ -30,7 +30,7 @@
 					{/if}
 					{if $item.target_domain != $fDomain}</a>{/if}</td>
 				<td>{$item.modified}</td>
-				<td><a href="{#url_edit_active#}?alias_domain=true&amp;domain={$item.alias_domain|escape:"url"}&amp;return={$smarty.config.url_list_virtual|escape:"url"}?domain={$fDomain|escape:"url"}&amp;limit={$current_limit|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
+				<td><a href="{#url_create_alias_domain#}&amp;edit={$item.alias_domain|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 				<td><a href="{#url_create_alias_domain#}&amp;edit={$item.alias_domain|escape:"url"}">{$PALANG.edit}</a></td>
 				<td><a href="{#url_delete#}?table=alias_domain&amp;delete={$item.alias_domain|escape:"url"}&amp;domain={$item.alias_domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain}');">{$PALANG.del}</a></td>
 				</tr>