diff --git a/RunGroopWebApp/Controllers/AccountController.cs b/RunGroopWebApp/Controllers/AccountController.cs
index cf5ec02..efd2c09 100644
--- a/RunGroopWebApp/Controllers/AccountController.cs
+++ b/RunGroopWebApp/Controllers/AccountController.cs
@@ -88,9 +88,17 @@ public async Task<IActionResult> Register(RegisterViewModel registerViewModel)
             var newUserResponse = await _userManager.CreateAsync(newUser, registerViewModel.Password);
 
             if (newUserResponse.Succeeded)
+            {
                 await _userManager.AddToRoleAsync(newUser, UserRoles.User);
+            }
+            else
+            {
+                TempData["Error"] = "Passwords must have at least one uppercase ('A'-'Z'), " +
+                    "one digit ('0'-'9') and one non alphanumeric character";
+                return View(registerViewModel);
+            }
 
-            return RedirectToAction("Index", "Race");
+            return RedirectToAction("Login", "Account");
         }
 
         [HttpGet]
diff --git a/RunGroopWebApp/Controllers/HomeController.cs b/RunGroopWebApp/Controllers/HomeController.cs
index 1d6009b..96b0abe 100644
--- a/RunGroopWebApp/Controllers/HomeController.cs
+++ b/RunGroopWebApp/Controllers/HomeController.cs
@@ -95,7 +95,6 @@ public async Task<IActionResult> Index(HomeViewModel homeVM)
                 {
                     State = userLocation.StateCode,
                     City = userLocation.CityName,
-                    ZipCode = createVM.ZipCode ?? 0,
                 }
             };
 
diff --git a/RunGroopWebApp/Models/Address.cs b/RunGroopWebApp/Models/Address.cs
index 49609b9..1cc66b7 100644
--- a/RunGroopWebApp/Models/Address.cs
+++ b/RunGroopWebApp/Models/Address.cs
@@ -9,6 +9,5 @@ public class Address
         public string Street { get; set; }
         public string City { get; set; }
         public string State { get; set; }
-        public int ZipCode  { get; set; }
     }
 }