diff --git a/sweebot.py b/sweebot.py
index de19f58..8e5c364 100644
--- a/sweebot.py
+++ b/sweebot.py
@@ -327,10 +327,11 @@ while True:
                             irc.send_irc(channel, nick + ": " + username)
                     
                     elif command[0] == "$welcome":
+                        name = nick if not len(command) > 1 else " ".join(command[1:])
                         if random(1,2) == 1:
-                            irc.send_irc(channel, "Heyo! Welcome to the channel,"  + command[1])
+                            irc.send_irc(channel, "Heyo! Welcome to the channel,"  + {name})
                         else:
-                            irc.send_irc(channel, "Welcome, " + command[1])
+                            irc.send_irc(channel, "Welcome, " + {name})
                     
                     elif command[0] == "$perms":
                         if len(command) == 2: