diff --git a/.gitignore b/.gitignore
index 911d236370..a6f1fac814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,3 +198,4 @@ FakesAssemblies/
 
 # Other
 project.lock.json
+*.jfm
diff --git a/src/Core/Services/UserService.cs b/src/Core/Services/UserService.cs
index 4248a0e6b6..209e0c406c 100644
--- a/src/Core/Services/UserService.cs
+++ b/src/Core/Services/UserService.cs
@@ -142,7 +142,16 @@ namespace Bit.Core.Services
             user.Email = newEmail;
             user.EmailVerified = true;
             user.RevisionDate = DateTime.UtcNow;
-            await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);
+
+            if(ciphers.Any())
+            {
+                await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);
+            }
+            else
+            {
+                await _userRepository.ReplaceAsync(user);
+            }
+
             return IdentityResult.Success;
         }
 
@@ -167,7 +176,15 @@ namespace Bit.Core.Services
                 }
 
                 user.RevisionDate = DateTime.UtcNow;
-                await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);
+                if(ciphers.Any())
+                {
+                    await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);
+                }
+                else
+                {
+                    await _userRepository.ReplaceAsync(user);
+                }
+
                 return IdentityResult.Success;
             }