pfSense

diff --git a/src/usr/local/pfSense/include/www/alias-utils.inc b/src/usr/local/pfSense/include/www/alias-utils.inc
index 2681719f66..87ea50c580 100644
--- a/src/usr/local/pfSense/include/www/alias-utils.inc
+++ b/src/usr/local/pfSense/include/www/alias-utils.inc
@@ -317,7 +317,7 @@ function saveAlias($post, $id, $force = false) {
         $data_errors[] = invalidaliasnamemsg($post['name']);
     }

-    $is_new_rule = empty(config_get_path('aliases/alias/' . $id));
+    $is_new_rule = (!is_numericint($id) || empty(config_get_path('aliases/alias/' . $id)));

     /* check for managed alias */
     if (!$is_new_rule && !$force && is_alias_managed($post)) {
@@ -326,7 +326,7 @@ function saveAlias($post, $id, $force = false) {

     /* check for name conflicts */
     foreach (config_get_path('aliases/alias', []) as $key => $alias) {
-        $is_different_rule_from_post = ($key != $id);
+        $is_different_rule_from_post = ($is_new_rule || ($key != $id));
         if (($alias['name'] == $post['name']) && ($is_new_rule || $is_different_rule_from_post)) {
             $data_errors[] = gettext("An alias with this name already exists.");
             break;