diff --git a/Api.SeaHavenIndustries/Controllers/AuthenticationController.cs b/Api.SeaHavenIndustries/Controllers/AuthenticationController.cs
index a3e0b95..346cde0 100644
--- a/Api.SeaHavenIndustries/Controllers/AuthenticationController.cs
+++ b/Api.SeaHavenIndustries/Controllers/AuthenticationController.cs
@@ -35,7 +35,7 @@ namespace Api.SeaHavenIndustries.Controllers
         public async Task<IActionResult> Login([FromBody] LoginModel model)
         {
             var user = await _userManager.FindByNameAsync(model.Username ?? "");
-            if (user.IsDeleted != true && user != null && await _userManager.CheckPasswordAsync(user, model.Password ?? ""))
+            if (user != null && user.IsDeleted != true && await _userManager.CheckPasswordAsync(user, model.Password ?? ""))
             {
                 // Standard login without 2FA
                 var userRoles = await _userManager.GetRolesAsync(user);
@@ -214,7 +214,7 @@ namespace Api.SeaHavenIndustries.Controllers
         private Random _random = new Random();
         private string GenerateRandomNo()
         {
-            return _random.Next(0, 9999).ToString("D4");
+            return _random.Next(0, 999999).ToString("D6");
         }
         #endregion
     }