diff --git a/delete-bin-obj-folders.bat b/delete-bin-obj-folders.bat
deleted file mode 100644
index 9e2a02a6..00000000
--- a/delete-bin-obj-folders.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@ECHO off
-cls
-
-ECHO Deleting all BIN and OBJ folders...
-ECHO.
-
-FOR /d /r . %%d in (bin,obj, logs, node_modules) DO ((
-			ECHO.Deleting: %%d
-			rd /s/q "%%d"
-		)
-	)
-)
-
-ECHO.
-ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit.
-pause > nul
\ No newline at end of file
diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat
new file mode 100644
index 00000000..d9e2badf
--- /dev/null
+++ b/delete-temp-directories.bat
@@ -0,0 +1,21 @@
+@echo off
+cls
+
+set directories= bin, obj, logs, node_modules
+set /a count = 0
+
+echo Deleting all following directories:
+for %%d in (%directories%) do echo %%d
+echo.
+
+for /d /r . %%d in (%directories%) do if exist "%%d" (
+    echo. Deleting: %%d
+    rd /s/q "%%d"
+    set /a count += 1
+)
+
+echo.
+echo The specified directories were successfully scanned.
+echo Number of deleted directories: %count%
+echo Press any key to exit.
+pause > nul
diff --git a/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs b/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs
index 058db2d8..075b1283 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs
@@ -1,8 +1,11 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using EShopOnAbp.IdentityService.ETOs;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Identity;
 using Volo.Abp.Uow;
@@ -13,16 +16,22 @@ public class UserLoggedInEventHandler : IDistributedEventHandler<UserLoggedInEto
 {
     private readonly IdentityUserManager _userManager;
     private readonly ILogger<UserLoggedInEventHandler> _logger;
+    private readonly IIdentityUserRepository _identityUserRepository;
+    private readonly ILookupNormalizer _lookupNormalizer;
 
-    public UserLoggedInEventHandler(IdentityUserManager userManager, ILogger<UserLoggedInEventHandler> logger)
+    public UserLoggedInEventHandler(IdentityUserManager userManager, 
+        ILogger<UserLoggedInEventHandler> logger,
+        IIdentityUserRepository identityUserRepository,
+        ILookupNormalizer lookupNormalizer)
     {
         _userManager = userManager;
         _logger = logger;
+        _identityUserRepository = identityUserRepository;
+        _lookupNormalizer = lookupNormalizer;
     }
-
-
+    
     [UnitOfWork]
-    public async virtual Task HandleEventAsync(UserLoggedInEto eventData)
+    public virtual async Task HandleEventAsync(UserLoggedInEto eventData)
     {
         if (eventData == null)
         {
@@ -59,8 +68,15 @@ public class UserLoggedInEventHandler : IDistributedEventHandler<UserLoggedInEto
         // This should run once to sync the admin userIds that seeded by IdentityModule and the Keycloak admin
         if (userInfo.UserName == "admin")
         {
-            var adminUser = await _userManager.FindByNameAsync("admin");
-            await _userManager.DeleteAsync(adminUser);
+            var normalizedName = _lookupNormalizer.NormalizeName(userInfo.UserName);
+            var adminUser = await _identityUserRepository.FindByNormalizedUserNameAsync(normalizedName);
+            foreach (var role in adminUser.Roles.ToList())
+            {
+                user.AddRole(role.RoleId);
+            }
+
+            // Hard delete the admin-user
+            await _identityUserRepository.HardDeleteAsync(adminUser, true);
         }
 
         var result = await _userManager.CreateAsync(user);