diff --git a/src/Discord.Net.Modules/ModuleManager.cs b/src/Discord.Net.Modules/ModuleManager.cs
index 0172e15c1..af70d0967 100644
--- a/src/Discord.Net.Modules/ModuleManager.cs
+++ b/src/Discord.Net.Modules/ModuleManager.cs
@@ -17,10 +17,7 @@ namespace Discord.Modules
         public event EventHandler<ServerEventArgs> ServerUpdated = delegate { };
         public event EventHandler<ServerEventArgs> ServerUnavailable = delegate { };
         public event EventHandler<ServerEventArgs> ServerAvailable = delegate { };
-
-        public event EventHandler<BanEventArgs> UserBanned = delegate { };
-        public event EventHandler<BanEventArgs> UserUnbanned = delegate { };
-
+        
         public event EventHandler<ChannelEventArgs> ChannelCreated = delegate { };
         public event EventHandler<ChannelEventArgs> ChannelDestroyed = delegate { };
         public event EventHandler<ChannelEventArgs> ChannelUpdated = delegate { };
@@ -29,11 +26,13 @@ namespace Discord.Modules
         public event EventHandler<RoleEventArgs> RoleUpdated = delegate { };
         public event EventHandler<RoleEventArgs> RoleDeleted = delegate { };
 
+        public event EventHandler<UserEventArgs> UserBanned = delegate { };
         public event EventHandler<UserEventArgs> UserJoined = delegate { };
         public event EventHandler<UserEventArgs> UserLeft = delegate { };
         public event EventHandler<UserEventArgs> UserUpdated = delegate { };
         public event EventHandler<UserEventArgs> UserPresenceUpdated = delegate { };
         public event EventHandler<UserEventArgs> UserVoiceStateUpdated = delegate { };
+        public event EventHandler<UserEventArgs> UserUnbanned = delegate { };
         public event EventHandler<ChannelUserEventArgs> UserIsTypingUpdated = delegate { };
 
         public event EventHandler<MessageEventArgs> MessageReceived = delegate { };
diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index 713ea4180..91b4c8477 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -419,9 +419,6 @@
     <Compile Include="..\Discord.Net\Enums\UserStatus.cs">
       <Link>Enums\UserStatus.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Events\BanEventArgs.cs">
-      <Link>Events\BanEventArgs.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Events\ChannelEventArgs.cs">
       <Link>Events\ChannelEventArgs.cs</Link>
     </Compile>
diff --git a/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanAdd.cs b/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanAdd.cs
index a89d19619..f3829ae70 100644
--- a/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanAdd.cs
+++ b/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanAdd.cs
@@ -3,11 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API.Client.GatewaySocket
 {
-    public sealed class GuildBanAddEvent
+    public sealed class GuildBanAddEvent : MemberReference
     {
-        [JsonProperty("guild_id"), JsonConverter(typeof(LongStringConverter))]
-        public ulong GuildId { get; set; }
-        [JsonProperty("user_id"), JsonConverter(typeof(LongStringConverter))]
-        public ulong UserId { get; set; }
     }
 }
diff --git a/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanRemove.cs b/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanRemove.cs
index c490fdc9a..00f3d2de3 100644
--- a/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanRemove.cs
+++ b/src/Discord.Net/API/Client/GatewaySocket/Events/GuildBanRemove.cs
@@ -3,11 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API.Client.GatewaySocket
 {
-    public sealed class GuildBanRemoveEvent
+    public sealed class GuildBanRemoveEvent : MemberReference
     {
-        [JsonProperty("guild_id"), JsonConverter(typeof(LongStringConverter))]
-        public ulong GuildId { get; set; }
-        [JsonProperty("user_id"), JsonConverter(typeof(LongStringConverter))]
-        public ulong UserId { get; set; }
     }
 }
diff --git a/src/Discord.Net/DiscordClient.Events.cs b/src/Discord.Net/DiscordClient.Events.cs
index bbb1d5e56..d078b3105 100644
--- a/src/Discord.Net/DiscordClient.Events.cs
+++ b/src/Discord.Net/DiscordClient.Events.cs
@@ -24,13 +24,13 @@ namespace Discord
         public event EventHandler<ServerEventArgs> ServerAvailable = delegate { };
         public event EventHandler<ServerEventArgs> ServerUpdated = delegate { };
         public event EventHandler<ServerEventArgs> ServerUnavailable = delegate { };
-        public event EventHandler<BanEventArgs> UserBanned = delegate { };
+        public event EventHandler<UserEventArgs> UserBanned = delegate { };
         public event EventHandler<ChannelUserEventArgs> UserIsTypingUpdated = delegate { };
         public event EventHandler<UserEventArgs> UserJoined = delegate { };
         public event EventHandler<UserEventArgs> UserLeft = delegate { };
         public event EventHandler<UserEventArgs> UserPresenceUpdated = delegate { };
         public event EventHandler<UserEventArgs> UserUpdated = delegate { };
-        public event EventHandler<BanEventArgs> UserUnbanned = delegate { };
+        public event EventHandler<UserEventArgs> UserUnbanned = delegate { };
         public event EventHandler<UserEventArgs> UserVoiceStateUpdated = delegate { };
 
         private void OnConnected()
@@ -77,8 +77,8 @@ namespace Discord
         private void OnServerUnavailable(Server server)
             => OnEvent(ServerUnavailable, new ServerEventArgs(server));
 
-        private void OnUserBanned(Server server, ulong userId)
-            => OnEvent(UserBanned, new BanEventArgs(server, userId));
+        private void OnUserBanned(User user)
+            => OnEvent(UserBanned, new UserEventArgs(user));
         private void OnUserIsTypingUpdated(Channel channel, User user)
             => OnEvent(UserIsTypingUpdated, new ChannelUserEventArgs(channel, user));
         private void OnUserJoined(User user)
@@ -87,8 +87,8 @@ namespace Discord
             => OnEvent(UserLeft, new UserEventArgs(user));
         private void OnUserPresenceUpdated(User user)
             => OnEvent(UserPresenceUpdated, new UserEventArgs(user));
-        private void OnUserUnbanned(Server server, ulong userId)
-            => OnEvent(UserUnbanned, new BanEventArgs(server, userId));
+        private void OnUserUnbanned(User user)
+            => OnEvent(UserUnbanned, new UserEventArgs(user));
         private void OnUserUpdated(User user)
             => OnEvent(UserUpdated, new UserEventArgs(user));
         private void OnUserVoiceStateUpdated(User user)
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index dc4ac5637..18e02ed85 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -718,24 +718,30 @@ namespace Discord
                     case "GUILD_BAN_ADD":
                         {
                             var data = e.Payload.ToObject<GuildBanAddEvent>(_serializer);
-                            var server = GetServer(data.GuildId);
+                            var server = GetServer(data.GuildId.Value);
                             if (server != null)
                             {
-                                if (Config.LogEvents)
-                                    Logger.Info($"User Banned: {server.Name}/{data.UserId}");
-                                OnUserBanned(server, data.UserId);
+                                var user = server.GetUser(data.User.Id);
+                                if (user != null)
+                                {
+                                    if (Config.LogEvents)
+                                        Logger.Info($"User Banned: {server.Name}/{user.Name}");
+                                    OnUserBanned(user);
+                                }
                             }
                         }
                         break;
                     case "GUILD_BAN_REMOVE":
                         {
                             var data = e.Payload.ToObject<GuildBanRemoveEvent>(_serializer);
-                            var server = GetServer(data.GuildId);
+                            var server = GetServer(data.GuildId.Value);
                             if (server != null)
                             {
+                                var user = new User(this, data.User.Id, server);
+                                user.Update(data.User);
                                 if (Config.LogEvents)
-                                    Logger.Info($"User Unbanned: {server.Name}/{data.UserId}");
-                                OnUserUnbanned(server, data.UserId);
+                                    Logger.Info($"User Unbanned: {server.Name}/{user.Name}");
+                                OnUserUnbanned(user);
                             }
                         }
                         break;
diff --git a/src/Discord.Net/Events/BanEventArgs.cs b/src/Discord.Net/Events/BanEventArgs.cs
deleted file mode 100644
index 0bddc38ea..000000000
--- a/src/Discord.Net/Events/BanEventArgs.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Discord
-{
-    public class BanEventArgs : EventArgs
-    {
-        public Server Server { get; }
-        public ulong UserId { get; }
-
-        public BanEventArgs(Server server, ulong userId)
-        {
-            Server = server;
-            UserId = userId;
-        }
-    }
-}