diff --git a/src/inc/clients/irc.js b/src/inc/clients/irc.js
index 0e9ff93..cfe1ea8 100644
--- a/src/inc/clients/irc.js
+++ b/src/inc/clients/irc.js
@@ -79,8 +79,22 @@ class irc {
           this.server.user.set( msg.params[1], tmpuser );
           break;
         case "319": // Chanlist Todo
-          //let tmpchan = {};
-          //if(this.server.user.has(msg.params[1]))
+          let tmpchan = new Map();
+          tmpuser = {};
+          if(this.server.user.has( msg.params[1] )) {
+            tmpuser = this.server.user.get( msg.params[1] );
+            if(tmpuser.channels)
+              tmpchan = tmpuser.channels;
+          }
+          
+          let chans = msg.params[2].trim().split(" ");
+          for(let chan in chans) {
+            chan = chans[chan].split("#");
+            tmpchan.set(`#${chan[1]}`, chan[0]);
+          }
+          tmpuser.channels = tmpchan;
+
+          this.server.user.set( msg.params[1], tmpuser );
           break;
         case "330": // Quarknet
           tmpuser = {};