diff --git a/src/Discord.Net/API/Common/User.cs b/src/Discord.Net/API/Common/User.cs
index 7e37d2cf8..9c4ff6911 100644
--- a/src/Discord.Net/API/Common/User.cs
+++ b/src/Discord.Net/API/Common/User.cs
@@ -10,13 +10,17 @@ namespace Discord.API
         public string Username { get; set; }
         [JsonProperty("discriminator")]
         public string Discriminator { get; set; }
+        [JsonProperty("bot")]
+        public bool Bot { get; set; }
         [JsonProperty("avatar")]
         public string Avatar { get; set; }
+
+        //CurrentUser
         [JsonProperty("verified")]
-        public bool IsVerified { get; set; }
+        public bool Verified { get; set; }
         [JsonProperty("email")]
         public string Email { get; set; }
-        [JsonProperty("bot")]
-        public bool Bot { get; set; }
+        [JsonProperty("mfa_enabled")]
+        public bool MfaEnabled { get; set; }
     }
 }
diff --git a/src/Discord.Net/Entities/Users/ISelfUser.cs b/src/Discord.Net/Entities/Users/ISelfUser.cs
index 8efd0cef4..40f43b019 100644
--- a/src/Discord.Net/Entities/Users/ISelfUser.cs
+++ b/src/Discord.Net/Entities/Users/ISelfUser.cs
@@ -10,6 +10,8 @@ namespace Discord
         string Email { get; }
         /// <summary> Returns true if this user's email has been verified. </summary>
         bool IsVerified { get; }
+        /// <summary> Returns true if this user has enabled MFA on their account. </summary>
+        bool IsMfaEnabled { get; }
 
         Task ModifyAsync(Action<ModifyCurrentUserParams> func);
     }
diff --git a/src/Discord.Net/Entities/Users/SelfUser.cs b/src/Discord.Net/Entities/Users/SelfUser.cs
index 27ea3f178..393a1ad3a 100644
--- a/src/Discord.Net/Entities/Users/SelfUser.cs
+++ b/src/Discord.Net/Entities/Users/SelfUser.cs
@@ -9,6 +9,7 @@ namespace Discord
     {        
         public string Email { get; private set; }
         public bool IsVerified { get; private set; }
+        public bool IsMfaEnabled { get; private set; }
 
         public override DiscordClient Discord { get; }
 
@@ -24,7 +25,8 @@ namespace Discord
             base.Update(model, source);
 
             Email = model.Email;
-            IsVerified = model.IsVerified;
+            IsVerified = model.Verified;
+            IsMfaEnabled = model.MfaEnabled;
         }
         
         public async Task UpdateAsync()