diff --git a/src/js/main.js b/src/js/main.js
index 430bd54..9c92018 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -338,7 +338,7 @@ let commands = {
       let url = 'Couldn\'t compose URL!'
 
       if (data) {
-        url = composer.embedURL(data.server, data.port, data.nickname, data.secure, true, data.autojoin.join(','))
+        url = composer.embedURL(data.server, data.port, data.nickname, data.secure, true, data.channels.join(','))
       }
 
       buffer.addMessage(url, null, 'help')
@@ -2258,7 +2258,7 @@ window.onload = function () {
   clientdom['frame'] = irc.primaryFrame.querySelector('#chat')
   clientdom['letterbox'] = clientdom.frame.querySelector('.letterbox')
   clientdom['nicklist'] = clientdom.frame.querySelector('.nicklist')
-  clientdom['currentNickname'] = clientdom.frame.querySelector('.userNickname')
+  clientdom['currentNickname'] = clientdom.frame.querySelector('.my_nickname')
   clientdom['input'] = clientdom.frame.querySelector('.userinput')
   clientdom['send'] = clientdom.frame.querySelector('.sendbutton')
   clientdom['chat'] = clientdom.frame.querySelector('.chatarea')