diff --git a/Notesnook.API/Controllers/UsersController.cs b/Notesnook.API/Controllers/UsersController.cs
index 3aa91c6..2f70ac4 100644
--- a/Notesnook.API/Controllers/UsersController.cs
+++ b/Notesnook.API/Controllers/UsersController.cs
@@ -78,6 +78,8 @@ namespace Notesnook.API.Controllers
 
             if (user.AttachmentsKey != null)
                 await UserService.SetUserAttachmentsKeyAsync(response.UserId, user.AttachmentsKey);
+            else if (user.Profile != null)
+                await UserService.SetUserProfileAsync(response.UserId, user.Profile);
             else return BadRequest();
 
             return Ok();
@@ -102,7 +104,7 @@ namespace Notesnook.API.Controllers
 
                 if (await UserService.DeleteUserAsync(userId, User.FindFirstValue("jti")))
                 {
-                    Response response = await this.httpClient.ForwardAsync<Response>(this.HttpContextAccessor, $"{Servers.IdentityServer.ToString()}/account/unregister", HttpMethod.Post);
+                    Response response = await this.httpClient.ForwardAsync<Response>(HttpContextAccessor, $"{Servers.IdentityServer}/account/unregister", HttpMethod.Post);
                     if (!response.Success) return BadRequest();
 
                     return Ok();
diff --git a/Streetwriters.Data/DbContexts/MongoDbContext.cs b/Streetwriters.Data/DbContexts/MongoDbContext.cs
index 40d5e5e..9391d36 100644
--- a/Streetwriters.Data/DbContexts/MongoDbContext.cs
+++ b/Streetwriters.Data/DbContexts/MongoDbContext.cs
@@ -51,7 +51,7 @@ namespace Streetwriters.Data.DbContexts
                 using (IClientSessionHandle session = await MongoClient.StartSessionAsync())
                 {
 #if DEBUG
-                    await Task.WhenAll(_commands.Select(c => c(session, default(CancellationToken))));
+                    await Task.WhenAll(_commands.Select(c => c(session, default)));
 #else
                     await session.WithTransactionAsync(async (handle, token) =>
                     {
diff --git a/Streetwriters.Identity/Services/EmailAddressValidator.cs b/Streetwriters.Identity/Services/EmailAddressValidator.cs
index f220a27..ca7d36f 100644
--- a/Streetwriters.Identity/Services/EmailAddressValidator.cs
+++ b/Streetwriters.Identity/Services/EmailAddressValidator.cs
@@ -10,7 +10,7 @@ namespace Streetwriters.Identity.Services
     public class EmailAddressValidator
     {
         private static DateTimeOffset LAST_FETCH_TIME = DateTimeOffset.MinValue;
-        private static HashSet<string> BLACKLISTED_DOMAINS = new HashSet<string>();
+        private static HashSet<string> BLACKLISTED_DOMAINS = new();
 
         public static async Task<bool> IsEmailAddressValidAsync(string email)
         {