diff --git a/src/Discord.Net/Entities/Users/SelfUser.cs b/src/Discord.Net/Entities/Users/SelfUser.cs
index 4629e85a0..27ea3f178 100644
--- a/src/Discord.Net/Entities/Users/SelfUser.cs
+++ b/src/Discord.Net/Entities/Users/SelfUser.cs
@@ -40,6 +40,10 @@ namespace Discord
 
             var args = new ModifyCurrentUserParams();
             func(args);
+
+            if (!args.Username.IsSpecified)
+                args.Username = Username;
+
             var model = await Discord.ApiClient.ModifySelfAsync(args).ConfigureAwait(false);
             Update(model, UpdateSource.Rest);
         }