diff --git a/sopel_modules/SpiceBot_AI/AI.py b/sopel_modules/SpiceBot_AI/AI.py
index 6381c9a..cf1b6c9 100644
--- a/sopel_modules/SpiceBot_AI/AI.py
+++ b/sopel_modules/SpiceBot_AI/AI.py
@@ -52,10 +52,6 @@ def bot_command_nick(bot, trigger):
             bot.osd(trigger.nick + ", where would you like me to beam you?")
         return
 
-    elif fulltrigger.lower().startswith("beam me up"):
-        bot.osd("locks onto " + trigger.nick + "s coordinates and transports them to the transporter room.", 'action')
-        return
-
     elif fulltrigger.lower().endswith(tuple(["order 66"])):
 
         if fulltrigger.lower() == "execute order 66":
diff --git a/sopel_modules/SpiceBot_AI/AI_aiml.py b/sopel_modules/SpiceBot_AI/AI_aiml.py
index bf8a1f1..164619d 100644
--- a/sopel_modules/SpiceBot_AI/AI_aiml.py
+++ b/sopel_modules/SpiceBot_AI/AI_aiml.py
@@ -49,6 +49,7 @@ def bot_command_rule(bot, trigger):
     if str(message).lower().startswith(str(bot.nick).lower()):
         command_type = 'nickname'
         trigger_args, trigger_command = SpiceBot.prerun.trigger_args(message, 'nickname')
+        trigger_args.insert(0, trigger_command)
         fulltrigger = spicemanip.main(trigger_args, 0)
         if str(trigger_command).startswith("?"):
             return
@@ -59,6 +60,7 @@ def bot_command_rule(bot, trigger):
     else:
         command_type = 'module'
         trigger_args, trigger_command = SpiceBot.prerun.trigger_args(message, 'module')
+        trigger_args.insert(0, trigger_command)
         fulltrigger = spicemanip.main(trigger_args, 0)
 
     returnmessage = SpiceBot.botai.on_message(bot, trigger, message)
@@ -66,7 +68,6 @@ def bot_command_rule(bot, trigger):
         bot.osd(str(returnmessage))
     else:
         if command_type == 'nickname':
-            bot.say(str(trigger_args[0].lower()))
 
             if trigger_args[0].lower() in ["what", "where"] and trigger_args[0].lower() in ["is", "are"]:
                 searchterm = spicemanip.main(trigger_args, "3+") or None
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_transporter.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_transporter.aiml
new file mode 100644
index 0000000..b0aec2a
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_transporter.aiml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml version="1.0">
+
+<category>
+  <pattern>BOTNICK beam me up</pattern>
+      <template>locks onto triggernicks coordinates and transports them to the transporter room.</template>
+</category>
+
+</aiml>