diff --git a/RentACar/Data/Data/RentACarDbContext.cs b/RentACar/Data/Data/RentACarDbContext.cs
index c6fec30..bb23c72 100644
--- a/RentACar/Data/Data/RentACarDbContext.cs
+++ b/RentACar/Data/Data/RentACarDbContext.cs
@@ -28,35 +28,33 @@ namespace Data
         {
 
             base.OnModelCreating(modelBuilder);
+            //string[] roles = { "Admin", "Employee" };
 
-            this.Database.EnsureCreated();
-            string[] roles = { "Admin", "Employee" };
+            //foreach (string role in roles)
+            //{
+            //    IdentityRole roleToCheck = await this.Roles.FirstOrDefaultAsync(roleToCheck => roleToCheck.Name == role);
+            //    if (roleToCheck == null)
+            //    {
+            //        //this.Roles.Add(new IdentityRole(role));
+            //        modelBuilder.Entity<IdentityRole>().HasData(new IdentityRole(role));
+            //    }
+            //}
 
-            foreach (string role in roles)
-            {
-                IdentityRole roleToCheck = await this.Roles.FirstOrDefaultAsync(roleToCheck => roleToCheck.Name == role);
-                if (roleToCheck == null)
-                {
-                    //this.Roles.Add(new IdentityRole(role));
-                    modelBuilder.Entity<IdentityRole>().HasData(new IdentityRole(role));
-                }
-            }
+            //PasswordHasher<User> passwordHasher = new PasswordHasher<User>();
 
-            PasswordHasher<User> passwordHasher = new PasswordHasher<User>();
-
-            User initialUser = new User();
-            initialUser.Id = Guid.NewGuid().ToString();
-            initialUser.UserName = "admin";
-            initialUser.PasswordHash = passwordHasher.HashPassword(initialUser, "admin");
+            //User initialUser = new User();
+            //initialUser.Id = Guid.NewGuid().ToString();
+            //initialUser.UserName = "admin";
+            //initialUser.PasswordHash = passwordHasher.HashPassword(initialUser, "admin");
 
 
-            if (this.Users.FirstOrDefaultAsync() != null)
-            {
+            //if (this.Users.FirstOrDefaultAsync() != null)
+            //{
 
-                modelBuilder.Entity<User>().HasData(initialUser);
-                IdentityRole<string> adminRole = await this.Roles.FirstOrDefaultAsync(role => role.Name == "Admin");
-                modelBuilder.Entity<IdentityUserRole<string>>().HasData(new IdentityUserRole<string> {RoleId = adminRole.Id, UserId = initialUser.Id});
-            }
+            //    modelBuilder.Entity<User>().HasData(initialUser);
+            //    IdentityRole<string> adminRole = await this.Roles.FirstOrDefaultAsync(role => role.Name == "Admin");
+            //    modelBuilder.Entity<IdentityUserRole<string>>().HasData(new IdentityUserRole<string> {RoleId = adminRole.Id, UserId = initialUser.Id});
+            //}
 
             modelBuilder.Entity<Rents>().HasOne(rents => rents.User);
             modelBuilder.Entity<Rents>().HasOne(rents => rents.Car);
@@ -67,7 +65,6 @@ namespace Data
                 Brand = "Trabant"
             }) ;
 
-            this.SaveChanges();
         }
 
     }
diff --git a/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml b/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml
index d9b50ab..ae33728 100644
--- a/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml
+++ b/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml
@@ -17,6 +17,11 @@
                 <input asp-for="Input.Email" class="form-control" />
                 <span asp-validation-for="Input.Email" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <label asp-for="Input">Username</label>
+                <input asp-for="Input" class="form-control" />
+                <span asp-validation-for="Input" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="Input.Password"></label>
                 <input asp-for="Input.Password" class="form-control" />
diff --git a/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml.cs b/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml.cs
index 8f92fe7..5a520fb 100644
--- a/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -75,7 +75,7 @@ namespace WebApp.Areas.Identity.Pages.Account
             ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList();
             if (ModelState.IsValid)
             {
-                var user = new User { UserName = Input.Email, Email = Input.Email };
+                var user = new User { Id = Guid.NewGuid().ToString(), UserName = Input.Email, Email = Input.Email };
                 var result = await _userManager.CreateAsync(user, Input.Password);
                 if (result.Succeeded)
                 {
diff --git a/RentACar/WebApp/Startup.cs b/RentACar/WebApp/Startup.cs
index 416ff74..083f3b5 100644
--- a/RentACar/WebApp/Startup.cs
+++ b/RentACar/WebApp/Startup.cs
@@ -43,6 +43,7 @@ namespace API
             })
                 .AddRoles<IdentityRole>()
                 .AddDefaultUI()
+                .AddDefaultTokenProviders()
                 .AddEntityFrameworkStores<RentACarDbContext>();
 
             services.AddControllersWithViews();