diff --git a/src/Core/Models/Table/User.cs b/src/Core/Models/Table/User.cs
index 644841f7f9..40952eaaa8 100644
--- a/src/Core/Models/Table/User.cs
+++ b/src/Core/Models/Table/User.cs
@@ -19,7 +19,6 @@ namespace Bit.Core.Models.Table
         public string MasterPasswordHint { get; set; }
         public string Culture { get; set; } = "en-US";
         public string SecurityStamp { get; set; }
-        public TwoFactorProviderType? TwoFactorProvider { get; set; }
         public string TwoFactorProviders { get; set; }
         public string TwoFactorRecoveryCode { get; set; }
         public string EquivalentDomains { get; set; }
diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs
index d4c273642b..9e7d408d09 100644
--- a/src/Core/Services/Implementations/UserService.cs
+++ b/src/Core/Services/Implementations/UserService.cs
@@ -474,7 +474,6 @@ namespace Bit.Core.Services
             }
 
             user.TwoFactorProviders = null;
-            user.TwoFactorProvider = null;
             user.TwoFactorRecoveryCode = null;
             await SaveUserAsync(user);
 
diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs
index 759d43252e..ff319c5e42 100644
--- a/src/Core/Services/NoopImplementations/NoopMailService.cs
+++ b/src/Core/Services/NoopImplementations/NoopMailService.cs
@@ -42,6 +42,11 @@ namespace Bit.Core.Services
             return Task.FromResult(0);
         }
 
+        public Task SendTwoFactorEmailAsync(string email, string token)
+        {
+            return Task.FromResult(0);
+        }
+
         public Task SendWelcomeEmailAsync(User user)
         {
             return Task.FromResult(0);
diff --git a/src/Sql/dbo/Stored Procedures/User_Create.sql b/src/Sql/dbo/Stored Procedures/User_Create.sql
index 735850f659..d13de10865 100644
--- a/src/Sql/dbo/Stored Procedures/User_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_Create.sql	
@@ -7,7 +7,6 @@
     @MasterPasswordHint NVARCHAR(50),
     @Culture NVARCHAR(10),
     @SecurityStamp NVARCHAR(50),
-    @TwoFactorProvider TINYINT,
     @TwoFactorProviders NVARCHAR(MAX),
     @TwoFactorRecoveryCode NVARCHAR(32),
     @EquivalentDomains NVARCHAR(MAX),
@@ -32,7 +31,6 @@ BEGIN
         [MasterPasswordHint],
         [Culture],
         [SecurityStamp],
-        [TwoFactorProvider],
         [TwoFactorProviders],
         [TwoFactorRecoveryCode],
         [EquivalentDomains],
@@ -54,7 +52,6 @@ BEGIN
         @MasterPasswordHint,
         @Culture,
         @SecurityStamp,
-        @TwoFactorProvider,
         @TwoFactorProviders,
         @TwoFactorRecoveryCode,
         @EquivalentDomains,
diff --git a/src/Sql/dbo/Stored Procedures/User_Update.sql b/src/Sql/dbo/Stored Procedures/User_Update.sql
index 4702bb8bb4..9659916717 100644
--- a/src/Sql/dbo/Stored Procedures/User_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_Update.sql	
@@ -7,7 +7,6 @@
     @MasterPasswordHint NVARCHAR(50),
     @Culture NVARCHAR(10),
     @SecurityStamp NVARCHAR(50),
-    @TwoFactorProvider TINYINT,
     @TwoFactorProviders NVARCHAR(MAX),
     @TwoFactorRecoveryCode NVARCHAR(32),
     @EquivalentDomains NVARCHAR(MAX),
@@ -32,7 +31,6 @@ BEGIN
         [MasterPasswordHint] = @MasterPasswordHint,
         [Culture] = @Culture,
         [SecurityStamp] = @SecurityStamp,
-        [TwoFactorProvider] = @TwoFactorProvider,
         [TwoFactorProviders] = @TwoFactorProviders,
         [TwoFactorRecoveryCode] = @TwoFactorRecoveryCode,
         [EquivalentDomains] = @EquivalentDomains,
diff --git a/src/Sql/dbo/Tables/User.sql b/src/Sql/dbo/Tables/User.sql
index 632d1cf889..0ca08aa323 100644
--- a/src/Sql/dbo/Tables/User.sql
+++ b/src/Sql/dbo/Tables/User.sql
@@ -7,7 +7,6 @@
     [MasterPasswordHint]              NVARCHAR (50)    NULL,
     [Culture]                         NVARCHAR (10)    NOT NULL,
     [SecurityStamp]                   NVARCHAR (50)    NOT NULL,
-    [TwoFactorProvider]               TINYINT          NULL,
     [TwoFactorProviders]              NVARCHAR (MAX)   NULL,
     [TwoFactorRecoveryCode]           NVARCHAR (32)    NULL,
     [EquivalentDomains]               NVARCHAR (MAX)   NULL,