diff --git a/RavenDB.Identity/IdentityUser.cs b/RavenDB.Identity/IdentityUser.cs
index 8e98a64..0271b14 100644
--- a/RavenDB.Identity/IdentityUser.cs
+++ b/RavenDB.Identity/IdentityUser.cs
@@ -92,6 +92,11 @@ namespace Raven.Identity
         /// </summary>
         public virtual List<UserLoginInfo> Logins { get; private set; }
 
+        /// <summary>
+        /// The list of two factor authentication recovery codes.
+        /// </summary>
+        public virtual List<string> TwoFactorRecoveryCodes { get; set; }
+
         /// <summary>
         /// Creates a new IdentityUser.
         /// </summary>
diff --git a/RavenDB.Identity/IdentityUserAuthToken.cs b/RavenDB.Identity/IdentityUserAuthToken.cs
index b8dd8a2..c25c7ad 100644
--- a/RavenDB.Identity/IdentityUserAuthToken.cs
+++ b/RavenDB.Identity/IdentityUserAuthToken.cs
@@ -7,7 +7,7 @@ using System.Text;
 namespace Raven.Identity
 {
     /// <summary>
-    /// A two-factor authentication authorization token.
+    /// A authorization token created by a login provider.
     /// </summary>
     public class IdentityUserAuthToken
     {
diff --git a/RavenDB.Identity/RavenDB.Identity.csproj b/RavenDB.Identity/RavenDB.Identity.csproj
index 600d2ca..818be6e 100644
--- a/RavenDB.Identity/RavenDB.Identity.csproj
+++ b/RavenDB.Identity/RavenDB.Identity.csproj
@@ -19,7 +19,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>4.2.0</Version>
+    <Version>4.3.0</Version>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <RootNamespace>Raven.Identity</RootNamespace>
   </PropertyGroup>
diff --git a/RavenDB.Identity/UserStore.cs b/RavenDB.Identity/UserStore.cs
index 8e43733..ead0009 100644
--- a/RavenDB.Identity/UserStore.cs
+++ b/RavenDB.Identity/UserStore.cs
@@ -26,7 +26,8 @@ namespace Raven.Identity
         IUserTwoFactorStore<TUser>, 
         IUserPhoneNumberStore<TUser>,
         IUserAuthenticatorKeyStore<TUser>,
-        IUserAuthenticationTokenStore<TUser>
+        IUserAuthenticationTokenStore<TUser>,
+        IUserTwoFactorRecoveryCodeStore<TUser>
         where TUser : IdentityUser
     {
         private bool _disposed;
@@ -699,6 +700,25 @@ namespace Raven.Identity
 
             return tokenOrNull.Value;
         }
+        
+        /// <inheritdoc />
+        public Task ReplaceCodesAsync(TUser user, IEnumerable<string> recoveryCodes, CancellationToken cancellationToken)
+        {
+            user.TwoFactorRecoveryCodes = new List<string>(recoveryCodes);
+            return Task.CompletedTask;
+        }
+
+        /// <inheritdoc />
+        public Task<bool> RedeemCodeAsync(TUser user, string code, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(user.TwoFactorRecoveryCodes.Remove(code));
+        }
+
+        /// <inheritdoc />
+        public Task<int> CountCodesAsync(TUser user, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(user.TwoFactorRecoveryCodes.Count);
+        }
 
         #endregion