diff --git a/cogs/alias.py b/cogs/alias.py
index b886cd23e..6b628c756 100644
--- a/cogs/alias.py
+++ b/cogs/alias.py
@@ -108,10 +108,7 @@ class Alias:
                 await self.bot.say("There are no aliases on this server.")
 
     async def check_aliases(self, message):
-        if not user_allowed(message):
-            return
-
-        if message.author.id == self.bot.user.id or \
+        if message.author == self.bot.user or \
                 len(message.content) < 2 or message.channel.is_private:
             return
 
@@ -119,7 +116,10 @@ class Alias:
         server = message.server
         prefix = self.get_prefix(msg)
 
-        if prefix and server.id in self.aliases:
+        if not prefix:
+            return
+
+        if server.id in self.aliases and user_allowed(message):
             alias = self.first_word(msg[len(prefix):]).lower()
             if alias in self.aliases[server.id]:
                 new_command = self.aliases[server.id][alias]
diff --git a/cogs/customcom.py b/cogs/customcom.py
index 1018856f8..29109966f 100644
--- a/cogs/customcom.py
+++ b/cogs/customcom.py
@@ -106,17 +106,18 @@ class CustomCommands:
             await self.bot.say("There are no custom commands in this server. Use addcom [command] [text]")
 
     async def checkCC(self, message):
-        if message.author.id == self.bot.user.id or len(message.content) < 2 or message.channel.is_private:
-            return
-
-        if not user_allowed(message):
+        if message.author == self.bot.user or\
+                len(message.content) < 2 or message.channel.is_private:
             return
 
         msg = message.content
         server = message.server
         prefix = self.get_prefix(msg)
 
-        if prefix and server.id in self.c_commands.keys():
+        if not prefix:
+            return
+
+        if server.id in self.c_commands and user_allowed(message):
             cmdlist = self.c_commands[server.id]
             cmd = msg[len(prefix):]
             if cmd in cmdlist.keys():