diff --git a/lib/Client.js b/lib/Client.js
index b4f54294a..49ed475a6 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -1074,6 +1074,12 @@ var Client = (function () {
 
 						if (userInCache) {
 							//user exists
+
+							data.user.username = data.user.username || userInCache.username;
+							data.user.id = data.user.id || userInCache.id;
+							data.user.discriminator = data.user.discriminator || userInCache.discriminator;
+							data.user.avatar = data.user.avatar || userInCache.avatar;
+
 							var presenceUser = new User(data.user);
 							if (presenceUser.equalsStrict(userInCache)) {
 								//they're exactly the same, an actual presence update
@@ -1086,8 +1092,8 @@ var Client = (function () {
 								});
 							} else {
 								//one of their details changed.
-								self.trigger("userUpdate", userInCache, presenceUser);
 								self.userCache[self.userCache.indexOf(userInCache)] = presenceUser;
+								self.trigger("userUpdate", userInCache, presenceUser);
 							}
 						}
 
diff --git a/src/Client.js b/src/Client.js
index bede31c3e..8b4e122d6 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -983,6 +983,12 @@ class Client {
 
 					if (userInCache) {
 						//user exists
+						
+						data.user.username = data.user.username || userInCache.username;
+						data.user.id = data.user.id || userInCache.id;
+						data.user.discriminator = data.user.discriminator || userInCache.discriminator;
+						data.user.avatar = data.user.avatar || userInCache.avatar;
+						
 						var presenceUser = new User(data.user);
 						if (presenceUser.equalsStrict(userInCache)) {
 							//they're exactly the same, an actual presence update
@@ -995,8 +1001,8 @@ class Client {
 							});
 						} else {
 							//one of their details changed.
-							self.trigger("userUpdate", userInCache, presenceUser);
 							self.userCache[self.userCache.indexOf(userInCache)] = presenceUser;
+							self.trigger("userUpdate", userInCache, presenceUser);
 						}
 					}
 
diff --git a/test/bot.1.js b/test/bot.1.js
index 9f324f719..55c57651a 100644
--- a/test/bot.1.js
+++ b/test/bot.1.js
@@ -44,7 +44,7 @@ mybot.on("ready", function () {
 });
 
 mybot.on("debug", function(info){
-	console.log(info);
+	
 })
 
 mybot.on("unknown", function(info){
@@ -55,12 +55,6 @@ mybot.on("channelUpdate", function(oldChan, newChan){
 	
 });
 
-mybot.on("startTyping", function(user, channel){
-	console.log("start", user);
-});
-mybot.on("stopTyping", function(user, channel){
-	console.log("stop", user);
-});
 
 function dump(msg) {
 	console.log(msg);