diff --git a/plugins/iambuttbot.py b/plugins/iambuttbot.py
index d8b1495..fa109c5 100644
--- a/plugins/iambuttbot.py
+++ b/plugins/iambuttbot.py
@@ -12,7 +12,7 @@ def iambuttbot(bot, input):
     if input.nick.lower() != 'buttbot':
         return
 
-    if '@' in input or '#' in input:
+    if '@' in input.inp or '#' in input.inp:
         return #prevent abuse
 
     password = open('iambuttbot_password').readlines()[0].strip()
diff --git a/plugins/log.py b/plugins/log.py
index 4b454ce..829f93b 100644
--- a/plugins/log.py
+++ b/plugins/log.py
@@ -84,8 +84,10 @@ def log(bot, input):
         fd = get_log_fd(bot.persist_dir, bot.network, 'raw')
         fd.write(timestamp + ' ' + input.raw + '\n')
 
-        if input.command == 'QUIT':
-            input.chan = 'quit'
+        if input.command == 'QUIT': # these are temporary fixes until proper
+            input.chan = 'quit'     # presence tracking is implemented
+        if input.command == 'NICK':
+            input.chan = 'nick' 
 
         beau = beautify(input)