diff --git a/RavenDB.Identity/RavenDB.Identity.csproj b/RavenDB.Identity/RavenDB.Identity.csproj
index 5556bcd..1470ff2 100644
--- a/RavenDB.Identity/RavenDB.Identity.csproj
+++ b/RavenDB.Identity/RavenDB.Identity.csproj
@@ -18,7 +18,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>2.0.3</Version>
+    <Version>2.0.4</Version>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>
 
diff --git a/RavenDB.Identity/ServiceCollectionExtensions.cs b/RavenDB.Identity/ServiceCollectionExtensions.cs
index cfd01dd..3b411f1 100644
--- a/RavenDB.Identity/ServiceCollectionExtensions.cs
+++ b/RavenDB.Identity/ServiceCollectionExtensions.cs
@@ -39,10 +39,10 @@ namespace RavenDB.Identity
                 throw new ArgumentNullException("Connection string cannot be null or empty.");
             }
 
-            var documentStore = new DocumentStore();
-            configureAction?.Invoke(documentStore);
-            
+            var documentStore = new DocumentStore();            
             documentStore.ParseConnectionString(connectionString);
+            documentStore.Conventions.RegisterIdConvention<IdentityUser>((dbname, commands, user) => "IdentityUsers/" + user.Id);
+            configureAction?.Invoke(documentStore);
             documentStore.Initialize();
 
             serviceCollection.AddSingleton<IDocumentStore>(documentStore);
@@ -76,25 +76,6 @@ namespace RavenDB.Identity
             return serviceCollection;
         }
 
-        /// <summary>
-        /// Registers a RavenDB as the user store.
-        /// </summary>
-        /// <typeparam name="TUser">The type of user. This should be a class you created derived from <see cref="IdentityUser"/>.</typeparam>
-        /// <param name="services"></param>
-        /// <returns>The same service collection so that multiple calls can be chained.</returns>
-        public static IServiceCollection AddRavenDbIdentity<TUser>(this IServiceCollection services)
-            where TUser : IdentityUser
-        {
-            // Add the AspNet identity system to work with our RavenDB identity objects.
-            services.AddIdentity<TUser, IdentityRole>()
-                .AddDefaultTokenProviders(); // options => options.Tokens.ProviderMap.Add("Default", new TokenProviderDescriptor(typeof(UserStore<TUser>)))
-
-            services.AddScoped<Microsoft.AspNetCore.Identity.IUserStore<TUser>, UserStore<TUser>>();
-            services.AddScoped<Microsoft.AspNetCore.Identity.IRoleStore<IdentityRole>, RoleStore<IdentityRole>>();
-
-            return services;
-        }
-
         /// <summary>
         /// Registers a RavenDB as the user store.
         /// </summary>
@@ -102,12 +83,20 @@ namespace RavenDB.Identity
         /// <param name="services"></param>
         /// <param name="setupAction">Identity options configuration.</param>
         /// <returns>The same service collection so that multiple calls can be chained.</returns>
-        public static IServiceCollection AddRavenDbIdentity<TUser>(this IServiceCollection services, Action<IdentityOptions> setupAction)
+        public static IServiceCollection AddRavenDbIdentity<TUser>(this IServiceCollection services, Action<IdentityOptions> setupAction = null)
             where TUser : IdentityUser
         {
             // Add the AspNet identity system to work with our RavenDB identity objects.
-            services.AddIdentity<TUser, IdentityRole>(setupAction)
-                .AddDefaultTokenProviders();
+            if (setupAction != null)
+            {
+                services.AddIdentity<TUser, IdentityRole>(setupAction)
+                    .AddDefaultTokenProviders();
+            }
+            else
+            {
+                services.AddIdentity<TUser, IdentityRole>()
+                    .AddDefaultTokenProviders();
+            }
 
             services.AddScoped<Microsoft.AspNetCore.Identity.IUserStore<TUser>, UserStore<TUser>>();
             services.AddScoped<Microsoft.AspNetCore.Identity.IRoleStore<IdentityRole>, RoleStore<IdentityRole>>();
diff --git a/RavenDB.Identity/UserStore.cs b/RavenDB.Identity/UserStore.cs
index 4a91c63..9240331 100644
--- a/RavenDB.Identity/UserStore.cs
+++ b/RavenDB.Identity/UserStore.cs
@@ -42,7 +42,6 @@ namespace RavenDB.Identity
         public UserStore(IAsyncDocumentSession session)
         {
             this._session = session;
-            this._session.Advanced.DocumentStore.Conventions.RegisterIdConvention<IdentityUser>((dbname, commands, user) => "IdentityUsers/" + user.Id);
         }
 
         #region IDispoable implementation