diff --git a/commands/objmanip.py b/commands/objmanip.py
index 22b22eb0d5..dcc377d376 100644
--- a/commands/objmanip.py
+++ b/commands/objmanip.py
@@ -107,7 +107,8 @@ def cmd_alias(cdat):
       session.msg("Alias whom?")
       return
   
-   duplicates = Attribute.objects.filter(attr_name="ALIAS").filter(attr_value=eq_args[1])
+   duplicates = functions_db.alias_search(pobject, eq_args[1])
+   # duplicates = Attribute.objects.filter(attr_name="ALIAS").filter(attr_value=eq_args[1])
    
    if duplicates:
       session.msg("Alias '%s' already exists." % (eq_args[1],))
@@ -115,7 +116,9 @@ def cmd_alias(cdat):
    else:
       if pobject.controls_other(target):
          target.set_attribute('ALIAS', eq_args[1])
-         session.msg("Alias %s (%s) added." % (target.get_name(), eq_args[1]))
+         session.msg("Alias '%s' set for %s." % (eq_args[1], target.get_name()))
+      else:
+         session.msg("You do not have access to set an alias for %s." % (target.get_name(),))
 
 def cmd_wipe(cdat):
    """