diff --git a/edit-alias.php b/edit-alias.php
index a9a2e81f..6e5f4e67 100644
--- a/edit-alias.php
+++ b/edit-alias.php
@@ -34,111 +34,126 @@ require_once('common.php');
 authentication_require_role('admin');
 $SESSID_USERNAME = authentication_get_username();
 
+if($CONF['alias_control_admin'] == 'NO' && !authentication_has_role('global-admin')) {
+    die("Check config.inc.php - domain administrators do not have the ability to edit user's aliases (alias_control_admin)");
+}
+
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
-   if (isset ($_GET['address'])) $fAddress = escape_string ($_GET['address']);
-   if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
-
-   if (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin'))
-   {
-      $result = db_query ("SELECT * FROM $table_alias WHERE address='$fAddress' AND domain='$fDomain'");
-      if ($result['rows'] == 1)
-      {
-         $row = db_array ($result['result']);
-         $tGoto = $row['goto'];
-
-         /* Has a mailbox as well? Remove the address from $tGoto in order to edit just the real aliases */
-         $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'");
-         if ($result['rows'] == 1)
-         {
-            $tGoto = preg_replace ('/\s*,*\s*' . $fAddress . '\s*,*\s*/', '', $tGoto);
-         }
-      }
-   }
-   else
-   {
-      $tMessage = $PALANG['pEdit_alias_address_error'];
-   }
+    if (isset ($_GET['address'])) $fAddress = escape_string ($_GET['address']);
+    if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
+
+    if (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin'))
+    {
+        $result = db_query ("SELECT * FROM $table_alias WHERE address='$fAddress' AND domain='$fDomain'");
+        if ($result['rows'] == 1)
+        {
+            $row = db_array ($result['result']);
+            $tGoto = $row['goto'];
+
+            //. if we are not a global admin, and special_alias_control is NO, hide the alias that's the mailbox name.
+            if($CONF['special_alias_control'] == 'NO' && !authentication_has_role('global-admin')) {
+                /* Has a mailbox as well? Remove the address from $tGoto in order to edit just the real aliases */
+                $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'");
+                if ($result['rows'] == 1)
+                {
+                    $tGoto = preg_replace ('/\s*,*\s*' . $fAddress . '\s*,*\s*/', '', $tGoto);
+                }
+            }
+        }
+    }
+    else
+    {
+        $tMessage = $PALANG['pEdit_alias_address_error'];
+    }
 }
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
-   $pEdit_alias_goto = $PALANG['pEdit_alias_goto'];
-   
-   if (isset ($_GET['address'])) $fAddress = escape_string ($_GET['address']);
-   $fAddress = strtolower ($fAddress);
-   if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
-   if (isset ($_POST['fGoto'])) $fGoto = escape_string ($_POST['fGoto']);
-   $fGoto = strtolower ($fGoto);
-
-   if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
-   {
-      $error = 1;
-      $tGoto = $_POST['fGoto'];
-      $tMessage = $PALANG['pEdit_alias_domain_error'] . "$fDomain</span>";
-   }
-   elseif (!check_alias_owner ($SESSID_USERNAME, $fAddress))
-   {
-     $error = 1;
-     $tGoto = $fGoto;
-     $tMessage = $PALANG['pEdit_alias_result_error'];
-   }
-
-   $goto = preg_replace ('/\\\r\\\n/', ',', $fGoto);
-   $goto = preg_replace ('/\r\n/', ',', $goto);
-   $goto = preg_replace ('/[\s]+/i', '', $goto);
-   $goto = preg_replace ('/,*$|^,*/', '', $goto);
-   $goto = preg_replace ('/,,*/', ',', $goto);
-
-   if (empty ($goto))
-   {
-      $error = 1;
-      $tGoto = $_POST['fGoto'];
-      $tMessage = $PALANG['pEdit_alias_goto_text_error1'];
-   }
-
-   if ($error != 1)
-   {
-      $array = preg_split ('/,/', $goto);
-   }
-   else
-   {
-      $array = array();
-   }
-
-   for ($i = 0; $i < sizeof ($array); $i++) {
-      if (in_array ("$array[$i]", $CONF['default_aliases'])) continue;
-      if (empty ($array[$i])) continue; # TODO: should never happen - remove after 2.2 release
-      if (!check_email ($array[$i]))
-      {
-         $error = 1;
-         $tGoto = $goto;
-         $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]</span>";
-      }
-   }
-   
-   $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'");
-   /* The alias has a real mailbox as well, prepend $goto with it */
-   if ($result['rows'] == 1)
-   {
-      $goto = "$fAddress,$goto";
-   }
-
-   if ($error != 1)
-   {
-      $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fAddress' AND domain='$fDomain'");
-      if ($result['rows'] != 1)
-      {
-         $tMessage = $PALANG['pEdit_alias_result_error'];
-      }
-      else
-      {
-         db_log ($SESSID_USERNAME, $fDomain, 'edit_alias', "$fAddress -> $goto");
-
-         header ("Location: list-virtual.php?domain=$fDomain");
-         exit;
-      }
-   }
+    $pEdit_alias_goto = $PALANG['pEdit_alias_goto'];
+
+    if (isset ($_GET['address'])) $fAddress = escape_string ($_GET['address']);
+    $fAddress = strtolower ($fAddress);
+    if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
+    if (isset ($_POST['fGoto'])) $fGoto = escape_string ($_POST['fGoto']);
+    $fGoto = strtolower ($fGoto);
+
+    if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
+    {
+        $error = 1;
+        $tGoto = $_POST['fGoto'];
+        $tMessage = $PALANG['pEdit_alias_domain_error'] . "$fDomain</span>";
+    }
+    elseif (!check_alias_owner ($SESSID_USERNAME, $fAddress))
+    {
+        $error = 1;
+        $tGoto = $fGoto;
+        $tMessage = $PALANG['pEdit_alias_result_error'];
+    }
+
+    $goto = preg_replace ('/\\\r\\\n/', ',', $fGoto);
+    $goto = preg_replace ('/\r\n/', ',', $goto);
+    $goto = preg_replace ('/[\s]+/i', '', $goto);
+    $goto = preg_replace ('/,*$|^,*/', '', $goto);
+    $goto = preg_replace ('/,,*/', ',', $goto);
+
+    if (empty ($goto) && !authentication_has_role('global-admin'))
+    {
+        $error = 1;
+        $tGoto = $_POST['fGoto'];
+        $tMessage = $PALANG['pEdit_alias_goto_text_error1'];
+    }
+
+    if ($error != 1)
+    {
+        $array = preg_split ('/,/', $goto);
+    }
+    else
+    {
+        $array = array();
+    }
+
+    for ($i = 0; $i < sizeof ($array); $i++) {
+        if (in_array ("$array[$i]", $CONF['default_aliases'])) continue;
+        if (empty ($array[$i])) continue; # TODO: should never happen - remove after 2.2 release
+        if (!check_email ($array[$i]))
+        {
+            $error = 1;
+            $tGoto = $goto;
+            $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]</span>";
+        }
+    }
+
+    $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'");
+    /* The alias has a real mailbox as well, prepend $goto with it */
+    if ($result['rows'] == 1)
+    {
+        // ensure mailbox alias exists... if they're a domain admin, and they're not allowed to...
+        if($CONF['alias_control_admin'] == 'NO' && !authentication_has_role('global-admin')) {
+            $array[] = $fAddress;
+        }
+    }
+    // duplicates suck, mmkay..
+    $array = array_unique($array);
+
+    $goto = implode(',', $array);
+
+    if ($error != 1)
+    {
+        $goto = escape_string($goto);
+        $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fAddress' AND domain='$fDomain'");
+        if ($result['rows'] != 1)
+        {
+            $tMessage = $PALANG['pEdit_alias_result_error'];
+        }
+        else
+        {
+            db_log ($SESSID_USERNAME, $fDomain, 'edit_alias', "$fAddress -> $goto");
+
+            header ("Location: list-virtual.php?domain=$fDomain");
+            exit;
+        }
+    }
 }
 
 $fAddress = htmlentities($fAddress, ENT_QUOTES);