diff --git a/admin/edit-active.php b/admin/edit-active.php
index 48858d9a..5572abf7 100644
--- a/admin/edit-active.php
+++ b/admin/edit-active.php
@@ -31,6 +31,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    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']);
+   if (isset ($_GET['return'])) $fReturn = escape_string ($_GET['return']);
 
    if ($fUsername != '')
    {
@@ -72,7 +73,14 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 
    if ($error != 1)
    {
-      header ("Location: list-virtual.php?domain=$fDomain");
+      if ( $fReturn != "" )
+      {
+        header ("Location: $fReturn");
+      }
+      else
+      {
+        header ("Location: list-virtual.php?domain=$fDomain");
+      }
       exit;
    }
 
diff --git a/admin/search.php b/admin/search.php
index ed5ca527..ca0ae3af 100644
--- a/admin/search.php
+++ b/admin/search.php
@@ -39,18 +39,18 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 
    if ($CONF['alias_control'] == "YES")
    {
-      $query = "SELECT address,goto,modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
+      $query = "SELECT address,goto,modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
       if ('pgsql'==$CONF['database_type'])
       {
-         $query = "SELECT address,goto,extract (epoch from modified) as modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
+         $query = "SELECT address,goto,extract (epoch from modified) as modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
       }
    }
    else
    {
-      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
+      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
       if ('pgsql'==$CONF['database_type'])
       {
-         $query = "SELECT address,goto,extract(epoch from modified) as modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) ORDER BY address";
+         $query = "SELECT address,goto,extract(epoch from modified) as modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) ORDER BY address";
       }
    }
 
@@ -63,15 +63,16 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
          if ('pgsql'==$CONF['database_type'])
          {
             $row['modified'] = gmstrftime('%c %Z',$row['modified']);
+            $row['active']=('t'==$row['active']) ? 1 : 0;
          }
          $tAlias[] = $row;
       }
    }
 
-   $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' ORDER BY username";
+   $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
    if ('pgsql'==$CONF['database_type'])
    {
-      $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE username LIKE '%$fSearch%' ORDER BY username";
+      $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
    }
    $result = db_query ($query);
    if ($result['rows'] > 0)
@@ -82,6 +83,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
          {
             $row['created']=gmstrftime('%c %Z',$row['uts_created']);
             $row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
+            $row['active']=('t'==$row['active']) ? 1 : 0;
             unset($row['uts_created']);
             unset($row['uts_modified']);
          }
@@ -109,18 +111,18 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
    if ($CONF['alias_control'] == "YES")
    {
-      $query = "SELECT address,goto,modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
+      $query = "SELECT address,goto,modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
       if ('pgsql'==$CONF['database_type'])
       {
-         $query = "SELECT address,goto,extract (epoch from modified) as modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
+         $query = "SELECT address,goto,extract (epoch from modified) as modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
       }
    }
    else
    {
-      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
+      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
       if ('pgsql'==$CONF['database_type'])
       {
-         $query = "SELECT $table_alias.address,$table_alias.goto,extract(epoch from $table_alias.modified) as $table_modified,$table_alias.domain FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
+         $query = "SELECT $table_alias.address,$table_alias.goto,extract(epoch from $table_alias.modified) as $table_modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
       }
    }
 
@@ -133,6 +135,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
          if ('pgsql'==$CONF['database_type'])
          {
             $row['modified'] = gmstrftime('%c %Z',$row['modified']);
+            $row['active']=('t'==$row['active']) ? 1 : 0;
          }
          $tAlias[] = $row;
       }
@@ -141,7 +144,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
    $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
    if ('pgsql'==$CONF['database_type'])
    {
-      $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE username LIKE '%$fSearch%' ORDER BY username";
+      $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
    }
    $result = db_query ("$query");
    if ($result['rows'] > 0)
@@ -152,6 +155,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
          {
             $row['created']=gmstrftime('%c %Z',$row['uts_created']);
             $row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
+            $row['active']=('t'==$row['active']) ? 1 : 0;
             unset($row['uts_created']);
             unset($row['uts_modified']);
          }
diff --git a/edit-active.php b/edit-active.php
index 7ed58b50..0fb93d18 100644
--- a/edit-active.php
+++ b/edit-active.php
@@ -17,6 +17,7 @@
 //
 // fUsername
 // fDomain
+// fReturn
 //
 require ("./variables.inc.php");
 require ("./config.inc.php");
@@ -30,6 +31,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    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']);
+   if (isset ($_GET['return'])) $fReturn = escape_string ($_GET['return']);
    
    if (!check_owner ($SESSID_USERNAME, $fDomain))
    {
@@ -69,7 +71,14 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    
    if ($error != 1)
    {
-      header ("Location: overview.php?domain=$fDomain");
+      if ( $fReturn != "" )
+      {
+        header ("Location: $fReturn");
+      }
+      else
+      {
+        header ("Location: overview.php?domain=$fDomain");
+      }
       exit;
    }
    
diff --git a/search.php b/search.php
index 4717e0c2..614cfad8 100644
--- a/search.php
+++ b/search.php
@@ -43,11 +43,11 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 
    if ($CONF['alias_control_admin'] == "YES")
    {
-      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
+      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
    }
    else
    {
-      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
+      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
    }
 
    $result = db_query ($query);
@@ -60,19 +60,20 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
             if ('pgsql'==$CONF['database_type'])
             {
                $row['modified']=gmstrftime('%c %Z',$row['modified']);
+               $row['active']=('t'==$row['active']) ? 1 : 0;
             }         	
-         	$tAlias[] = $row;
+            $tAlias[] = $row;
          }
       }
    }
 
    if ($CONF['vacation_control_admin'] == 'YES')
    {
-      $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
+      $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
    }
    else
    {
-      $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' ORDER BY username";
+      $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
    }
 
    $result = db_query ($query);
@@ -87,7 +88,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
                $row['modified']=gmstrftime('%c %Z',$row['modified']);
                $row['active']=('t'==$row['active']) ? 1 : 0;
             }         	
-         	$tMailbox[] = $row;
+            $tMailbox[] = $row;
          }
       }
    }
@@ -112,11 +113,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
    if ($CONF['alias_control_admin'] == "YES")
    {
-      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
+      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
    }
    else
    {
-      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
+      $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
    }
 
    $result = db_query ($query);
@@ -129,6 +130,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
             if ('pgsql'==$CONF['database_type'])
             {
                $row['modified']=gmstrftime('%c %Z',$row['modified']);
+               $row['active']=('t'==$row['active']) ? 1 : 0;
             }
             $tAlias[] = $row;
          }
diff --git a/stylesheet.css b/stylesheet.css
index 31d1275d..e28f53c2 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -183,7 +183,7 @@ table {
 
 #overview h4, #overview P, #overview FORM, #admin_virtual h4, #admin_virtual P, #admin_virtual FORM {
 	display: inline;
-	padding-right: 20px;
+	padding-right: 10px;
 	line-height: 30px;
 }
 
diff --git a/templates/admin_search.tpl b/templates/admin_search.tpl
index ecefbaa6..d5a63339 100644
--- a/templates/admin_search.tpl
+++ b/templates/admin_search.tpl
@@ -32,6 +32,7 @@ if (sizeof ($tAlias) > 0)
    print "      <td>" . $PALANG['pOverview_alias_address'] . "</td>\n";
    print "      <td>" . $PALANG['pOverview_alias_goto'] . "</td>\n";
    print "      <td>" . $PALANG['pOverview_alias_modified'] . "</td>\n";
+   print "      <td>" . $PALANG['pOverview_alias_active'] . "</td>\n";
    print "      <td colspan=\"2\">&nbsp;</td>\n";
    print "   </tr>\n";
 
@@ -43,6 +44,8 @@ if (sizeof ($tAlias) > 0)
          print "      <td>" . $tAlias[$i]['address'] . "</td>\n";
          print "      <td>" . ereg_replace (",", "<br>", $tAlias[$i]['goto']) . "</td>\n";
          print "      <td>" . $tAlias[$i]['modified'] . "</td>\n";
+         $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+         print "      <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain']. "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
          print "      <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
          print "      <td><a href=\"delete.php?table=alias&delete=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
          print "   </tr>\n";
@@ -84,7 +87,7 @@ if (sizeof ($tMailbox) > 0)
          if ($CONF['quota'] == 'YES') print "      <td>" . divide_quota ($tMailbox[$i]['quota']) . "</td>\n";
          print "      <td>" . $tMailbox[$i]['modified'] . "</td>\n";
          $active = ($tMailbox[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
-         print "      <td><a href=\"edit-active.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "\">" . $active . "</a></td>\n";
+         print "      <td><a href=\"edit-active.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
          if ($CONF['alias_control'] == 'YES')
          {
             print "      <td><a href=\"edit-alias.php?address=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "\">" . $PALANG['pOverview_alias_edit'] . "</a></td>\n";
diff --git a/templates/search.tpl b/templates/search.tpl
index 072ceeb2..f9552b78 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -34,6 +34,7 @@ if (sizeof ($tAlias) > 0)
    print "      <td>" . $PALANG['pOverview_alias_address'] . "</td>\n";
    print "      <td>" . $PALANG['pOverview_alias_goto'] . "</td>\n";
    print "      <td>" . $PALANG['pOverview_alias_modified'] . "</td>\n";
+   print "      <td>" . $PALANG['pOverview_alias_active'] . "</td>\n";
    print "      <td colspan=\"2\">&nbsp;</td>\n";
    print "   </tr>\n";
 
@@ -47,6 +48,8 @@ if (sizeof ($tAlias) > 0)
          print "      <td>" . $tAlias[$i]['modified'] . "</td>\n";
          if ($CONF['special_alias_control'] == 'YES')
          {
+            $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+            print "      <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
             print "      <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
             print "      <td><a href=\"delete.php?delete=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
          }
@@ -54,6 +57,8 @@ if (sizeof ($tAlias) > 0)
          {
             if (check_alias_owner ($SESSID_USERNAME, $tAlias[$i]['address']))
             {
+               $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+               print "      <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
                print "      <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
                print "      <td><a href=\"delete.php?delete=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
             }
@@ -99,7 +104,7 @@ if (sizeof ($tMailbox) > 0)
          if ($CONF['quota'] == 'YES') print "      <td>" . divide_quota ($tMailbox[$i]['quota']) . "</td>\n";
          print "      <td>" . $tMailbox[$i]['modified'] . "</td>\n";
          $active = ($tMailbox[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
-         print "      <td><a href=\"edit-active.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "\">" . $active . "</a></td>\n";
+         print "      <td><a href=\"edit-active.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
          if ($CONF['vacation_control_admin'] == 'YES')
          {
             $v_active = ($tMailbox[$i]['v_active'] == 1) ? $PALANG['pOverview_vacation_edit'] : '';