diff --git a/src/commands/command.py b/src/commands/command.py
index e6badfe15c..395aa024ea 100644
--- a/src/commands/command.py
+++ b/src/commands/command.py
@@ -48,6 +48,8 @@ def _init_command(mcs, **kwargs):
     if not hasattr(mcs, 'locks'):
         # default if one forgets to define completely
         mcs.locks = "cmd:all()"
+    elif not "cmd:" in mcs.locks:
+        mcs.locks = "cmd:all();" + mcs.locks
     for lockstring in mcs.locks.split(';'):
         if lockstring and not ':' in lockstring:
             lockstring = "cmd:%s" % lockstring
diff --git a/src/objects/objects.py b/src/objects/objects.py
index 6a748cdbb3..73156c632e 100644
--- a/src/objects/objects.py
+++ b/src/objects/objects.py
@@ -911,7 +911,6 @@ class Exit(Object):
         # create an exit command.
         cmd = ExitCommand(key=exidbobj.db_key.strip().lower(),
                           aliases=exidbobj.aliases,
-                          locks=str(exidbobj.locks),
                           auto_help=False,
                           destination=exidbobj.db_destination,
                           obj=exidbobj)