diff --git a/lib/auth/UserPassword.js b/lib/auth/UserPassword.js
index 0f17eb9..150836f 100644
--- a/lib/auth/UserPassword.js
+++ b/lib/auth/UserPassword.js
@@ -127,7 +127,7 @@ module.exports = function UserPasswordAuthHandlers() {
                       stream.write(BUF_SUCCESS);
                     else
                       stream.write(BUF_FAILURE);
-                    cb(success);
+                    cb(success, user);
                   }
                 });
                 return;
diff --git a/lib/server.js b/lib/server.js
index bcac647..986cdd7 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -76,8 +76,9 @@ Server.prototype._onConnection = function(socket) {
     for (var a = 0, alen = auths.length; a < alen; ++a) {
       for (var m = 0, mlen = methods.length; m < mlen; ++m) {
         if (methods[m] === auths[a].METHOD) {
-          auths[a].server(socket, function(result) {
+          auths[a].server(socket, function(result, user) {
             if (result === true) {
+              socket.user = user;
               parser.authed = true;
               parser.start();
             } else {