diff --git a/src/core.py b/src/core.py
index bf2a25a7..8a4fc7de 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1753,7 +1753,8 @@ class Core(object):
             if tab.own_nick == nick:
                 self.information('/join: Nothing to do.', 'Info')
             else:
-                tab.command_nick(nick)
+                tab.own_nick = nick
+                tab.command_cycle('')
             return
 
         if room.startswith('@'):