diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 96286d318..1b94ab1dc 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -1173,9 +1173,13 @@ namespace Discord.WebSocket
                                         {
                                             if (guild != null)
                                             {
-                                                author = data.Member.IsSpecified // member isn't always included, but use it when we can
-                                                    ? guild.AddOrUpdateUser(data.Member.Value)
-                                                    : guild.AddOrUpdateUser(data.Author.Value); // user has no guild-specific data
+                                                if (data.Member.IsSpecified) // member isn't always included, but use it when we can
+                                                {
+                                                    data.Member.Value.User = data.Author.Value;
+                                                    author = guild.AddOrUpdateUser(data.Member.Value);
+                                                }
+                                                else
+                                                    author = guild.AddOrUpdateUser(data.Author.Value); // user has no guild-specific data
                                             }
                                             else if (channel is SocketGroupChannel)
                                                 author = (channel as SocketGroupChannel).GetOrAddUser(data.Author.Value);