diff --git a/FoodPicker.Infrastructure/Models/ApplicationUser.cs b/FoodPicker.Infrastructure/Models/ApplicationUser.cs
index b3a971e..1b95d8e 100644
--- a/FoodPicker.Infrastructure/Models/ApplicationUser.cs
+++ b/FoodPicker.Infrastructure/Models/ApplicationUser.cs
@@ -8,5 +8,6 @@ public class ApplicationUser : IdentityUser
         [Required]
         public string Name { get; set; }
         public bool VoteIsRequired { get; set; } = true;
+        public bool IsActive { get; set; } = true;
     }
 }
\ No newline at end of file
diff --git a/FoodPicker.Migrations/Migrations/20230907201038_Add user active bool.Designer.cs b/FoodPicker.Migrations/Migrations/20230907201038_Add user active bool.Designer.cs
new file mode 100644
index 0000000..1f7d52f
--- /dev/null
+++ b/FoodPicker.Migrations/Migrations/20230907201038_Add user active bool.Designer.cs	
@@ -0,0 +1,555 @@
+// <auto-generated />
+using System;
+using FoodPicker.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace FoodPicker.Migrations.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230907201038_Add user active bool")]
+    partial class Adduseractivebool
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.21")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("VoteIsRequired")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.AutoVote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Keyword")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("VoteOptionId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VoteOptionId");
+
+                    b.ToTable("AutoVotes");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.Meal", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ImageUrl")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("MealWeekId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool?>("SelectedForOrder")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MealWeekId");
+
+                    b.ToTable("Meals");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.MealRating", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("MealId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Rating")
+                        .HasColumnType("int");
+
+                    b.Property<string>("RatingComment")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("RatingTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MealId")
+                        .IsUnique();
+
+                    b.ToTable("MealRatings");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.MealVote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("MealId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int?>("VoteOptionId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("VoteOptionId");
+
+                    b.HasIndex("MealId", "UserId")
+                        .IsUnique();
+
+                    b.ToTable("MealVotes");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.MealWeek", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DeliveryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("MealWeekStatus")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MealWeeks");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.PersistentConfig", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConfigCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistentConfigs");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.VoteOption", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("Weight")
+                        .HasColumnType("double");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("VoteOptions");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.WeekUserComment", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("varchar(1000)");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("WeekId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("WeekId");
+
+                    b.ToTable("WeekUserComments");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.AutoVote", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.VoteOption", "VoteOption")
+                        .WithMany()
+                        .HasForeignKey("VoteOptionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("VoteOption");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.Meal", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.MealWeek", "MealWeek")
+                        .WithMany("Meals")
+                        .HasForeignKey("MealWeekId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MealWeek");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.MealRating", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.Meal", "Meal")
+                        .WithOne("MealRating")
+                        .HasForeignKey("FoodPicker.Infrastructure.Models.MealRating", "MealId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Meal");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.MealVote", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.Meal", "Meal")
+                        .WithMany("MealVotes")
+                        .HasForeignKey("MealId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FoodPicker.Infrastructure.Models.ApplicationUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.HasOne("FoodPicker.Infrastructure.Models.VoteOption", "VoteOption")
+                        .WithMany()
+                        .HasForeignKey("VoteOptionId");
+
+                    b.Navigation("Meal");
+
+                    b.Navigation("User");
+
+                    b.Navigation("VoteOption");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.WeekUserComment", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.ApplicationUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.HasOne("FoodPicker.Infrastructure.Models.MealWeek", "Week")
+                        .WithMany()
+                        .HasForeignKey("WeekId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+
+                    b.Navigation("Week");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FoodPicker.Infrastructure.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("FoodPicker.Infrastructure.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.Meal", b =>
+                {
+                    b.Navigation("MealRating");
+
+                    b.Navigation("MealVotes");
+                });
+
+            modelBuilder.Entity("FoodPicker.Infrastructure.Models.MealWeek", b =>
+                {
+                    b.Navigation("Meals");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/FoodPicker.Migrations/Migrations/20230907201038_Add user active bool.cs b/FoodPicker.Migrations/Migrations/20230907201038_Add user active bool.cs
new file mode 100644
index 0000000..a93f5bf
--- /dev/null
+++ b/FoodPicker.Migrations/Migrations/20230907201038_Add user active bool.cs	
@@ -0,0 +1,67 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FoodPicker.Migrations.Migrations
+{
+    public partial class Adduseractivebool : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MealVotes_VoteOptions_VoteOptionId",
+                table: "MealVotes");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "VoteOptionId",
+                table: "MealVotes",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsActive",
+                table: "AspNetUsers",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MealVotes_VoteOptions_VoteOptionId",
+                table: "MealVotes",
+                column: "VoteOptionId",
+                principalTable: "VoteOptions",
+                principalColumn: "Id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MealVotes_VoteOptions_VoteOptionId",
+                table: "MealVotes");
+
+            migrationBuilder.DropColumn(
+                name: "IsActive",
+                table: "AspNetUsers");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "VoteOptionId",
+                table: "MealVotes",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MealVotes_VoteOptions_VoteOptionId",
+                table: "MealVotes",
+                column: "VoteOptionId",
+                principalTable: "VoteOptions",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}
diff --git a/FoodPicker.Migrations/Migrations/ApplicationDbContextModelSnapshot.cs b/FoodPicker.Migrations/Migrations/ApplicationDbContextModelSnapshot.cs
index b861b84..f2c516c 100644
--- a/FoodPicker.Migrations/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/FoodPicker.Migrations/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -38,6 +38,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("EmailConfirmed")
                         .HasColumnType("tinyint(1)");
 
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<bool>("LockoutEnabled")
                         .HasColumnType("tinyint(1)");
 
@@ -189,7 +192,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("UserId")
                         .HasColumnType("varchar(255)");
 
-                    b.Property<int>("VoteOptionId")
+                    b.Property<int?>("VoteOptionId")
                         .HasColumnType("int");
 
                     b.HasKey("Id");
@@ -456,9 +459,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasOne("FoodPicker.Infrastructure.Models.VoteOption", "VoteOption")
                         .WithMany()
-                        .HasForeignKey("VoteOptionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("VoteOptionId");
 
                     b.Navigation("Meal");
 
diff --git a/FoodPicker.Web/Controllers/ApiController.cs b/FoodPicker.Web/Controllers/ApiController.cs
index 3807e39..64800be 100644
--- a/FoodPicker.Web/Controllers/ApiController.cs
+++ b/FoodPicker.Web/Controllers/ApiController.cs
@@ -58,7 +58,7 @@ group v by v.UserId into u
                 where u.Count() >= numMeals
                 select u.Key;
             
-            var users = _userManager.Users.ToList();
+            var users = _userManager.Users.Where(u => u.IsActive).ToList();
 
             var fullyVotedNames =
                 users.Where(x => fullyVotedUserIds.Contains(x.Id)).Select(x => x.Name).ToList();
diff --git a/FoodPicker.Web/Controllers/AuthController.cs b/FoodPicker.Web/Controllers/AuthController.cs
index 9f726a8..6261d26 100644
--- a/FoodPicker.Web/Controllers/AuthController.cs
+++ b/FoodPicker.Web/Controllers/AuthController.cs
@@ -17,8 +17,9 @@ public class AuthController : Controller
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly IConfiguration _configuration;
-        
-        public AuthController(UserManager<ApplicationUser> userManager, SignInManager<ApplicationUser> signInManager, ILogger<AuthController> logger, IConfiguration configuration)
+
+        public AuthController(UserManager<ApplicationUser> userManager, SignInManager<ApplicationUser> signInManager,
+            ILogger<AuthController> logger, IConfiguration configuration)
         {
             _userManager = userManager;
             _signInManager = signInManager;
@@ -28,12 +29,9 @@ public AuthController(UserManager<ApplicationUser> userManager, SignInManager<Ap
 
         public class LoginViewModel
         {
-            [Required]
-            [Display(Name="User")]
-            public string UserId { get; set; }
-            
-            [Display(Name="Password")]
-            public string Password { get; set; }
+            [Required] [Display(Name = "User")] public string UserId { get; set; }
+
+            [Display(Name = "Password")] public string Password { get; set; }
         }
 
         /// <summary>
@@ -46,38 +44,46 @@ public class LoginViewModel
         [HttpGet]
         public async Task<IActionResult> Login([FromQuery] string returnUrl, [FromQuery] bool autoLogin = false)
         {
-            if (autoLogin && _configuration["ClaimsInHeaders"] == "True" && Request.Headers.ContainsKey("X-Token-Subject"))
+            if (autoLogin
+                && bool.TryParse(_configuration["ClaimsInHeaders"], out var claimsInHeaders) && claimsInHeaders
+                && Request.Headers.TryGetValue("X-Token-Subject", out var subject))
             {
-                var user = await _userManager.FindByNameAsync(Request.Headers["X-Token-Subject"]);
-                if (user != null)
+                var user = await _userManager.FindByNameAsync(subject);
+                if (user is { IsActive: true })
                 {
                     // We assume that if we're being given claims that they have been properly authenticated
                     await _signInManager.SignInWithClaimsAsync(user, true,
                         new[] { new Claim("PasswordLogin", "true") });
-                    
+
                     if (!string.IsNullOrEmpty(returnUrl))
                     {
                         return LocalRedirect(returnUrl);
                     }
+
                     return RedirectToAction("Index", "Home");
                 }
             }
-            
+
             if (!_userManager.Users.Any()) return RedirectToAction("Register");
             return View();
         }
-        
+
         [HttpPost]
         public async Task<IActionResult> Login([FromForm] LoginViewModel model, [FromQuery] string returnUrl)
         {
             var user = await _userManager.FindByIdAsync(model.UserId);
+            if (!user.IsActive)
+            {
+                ModelState.AddModelError("UserId", "User Invalid");
+                return View();
+            }
             if (!string.IsNullOrEmpty(model.Password) && await _userManager.IsInRoleAsync(user, "Admin"))
             {
                 // Password login
                 if (await _userManager.CheckPasswordAsync(user, model.Password))
                 {
                     await _signInManager.SignInWithClaimsAsync(user, false,
-                            new[] { new Claim("PasswordLogin", "true") });
+                        new[] { new Claim("PasswordLogin", "true") });
                 }
                 else
                 {
@@ -93,27 +99,26 @@ await _signInManager.SignInWithClaimsAsync(user, false,
                     IsPersistent = true
                 });
             }
-            
+
             if (!string.IsNullOrEmpty(returnUrl))
             {
                 return LocalRedirect(returnUrl);
             }
+
             return RedirectToAction("Index", "Home");
         }
-        
+
         public class RegisterViewModel
         {
-            [Required]
-            public string Name { get; set; }
-            
-            [Required]
-            public string Username { get; set; }
-            
+            [Required] public string Name { get; set; }
+
+            [Required] public string Username { get; set; }
+
             [Required]
             [DataType(DataType.Password)]
             public string Password { get; set; }
         }
-        
+
         [HttpGet]
         public IActionResult Register()
         {
@@ -121,7 +126,7 @@ public IActionResult Register()
 
             return View();
         }
-        
+
         [HttpPost]
         public async Task<IActionResult> Register([FromForm] RegisterViewModel model)
         {
@@ -130,11 +135,13 @@ public async Task<IActionResult> Register([FromForm] RegisterViewModel model)
             {
                 return View();
             }
+
             var createResult = await _userManager.CreateAsync(new ApplicationUser()
             {
                 Name = model.Name,
                 UserName = model.Username,
                 VoteIsRequired = true,
+                IsActive = true,
             }, model.Password);
             if (!createResult.Succeeded)
             {
@@ -146,7 +153,7 @@ public async Task<IActionResult> Register([FromForm] RegisterViewModel model)
 
                 _logger.LogError("Error creating user: {Error}", string.Join(", ", createResult.Errors));
             }
-            
+
             var user = await _userManager.FindByNameAsync(model.Username);
             await _userManager.AddPasswordAsync(user, model.Password);
             await _userManager.AddToRoleAsync(user, "Admin");
diff --git a/FoodPicker.Web/Controllers/UserController.cs b/FoodPicker.Web/Controllers/UserController.cs
index f37bbd1..1f51a08 100644
--- a/FoodPicker.Web/Controllers/UserController.cs
+++ b/FoodPicker.Web/Controllers/UserController.cs
@@ -44,6 +44,7 @@ public class UserViewModel
             public bool IsAdmin { get; set; }
 
             [Required] public bool VoteIsRequired { get; set; } = true;
+            [Required] public bool IsActive { get; set; } = true;
         }
         
         [HttpGet]
@@ -68,7 +69,8 @@ public async Task<IActionResult> CreateOrEdit(string id)
                     Username = user.UserName,
                     Password = null,
                     IsAdmin = await _userManager.IsInRoleAsync(user, "Admin"),
-                    VoteIsRequired = user.VoteIsRequired
+                    VoteIsRequired = user.VoteIsRequired,
+                    IsActive = user.IsActive,
                 };
             }
             return View(model);
@@ -87,8 +89,10 @@ public async Task<IActionResult> CreateOrEdit(string id, [FromForm] UserViewMode
                 dbModel = new ApplicationUser
                 {
                     Id = Guid.NewGuid().ToString(),
+                    Name = model.Name,
                     UserName = model.Username,
-                    VoteIsRequired = model.VoteIsRequired
+                    VoteIsRequired = model.VoteIsRequired,
+                    IsActive = model.IsActive,
                 };
                 await _userManager.CreateAsync(dbModel);
             }
@@ -98,6 +102,7 @@ public async Task<IActionResult> CreateOrEdit(string id, [FromForm] UserViewMode
                 dbModel.Name = model.Name;
                 dbModel.UserName = model.Username;
                 dbModel.VoteIsRequired = model.VoteIsRequired;
+                dbModel.IsActive = model.IsActive;
                 await _userManager.UpdateAsync(dbModel);
             }
             
diff --git a/FoodPicker.Web/Controllers/WeekController.cs b/FoodPicker.Web/Controllers/WeekController.cs
index eff3c92..a61cbbe 100644
--- a/FoodPicker.Web/Controllers/WeekController.cs
+++ b/FoodPicker.Web/Controllers/WeekController.cs
@@ -251,7 +251,7 @@ public async Task<IActionResult> ViewResults(int? weekId)
             var model = new ViewResultsViewModel
             {
                 Week = week,
-                ParticipatingUsers = await _userManager.Users.ToListAsync(),
+                ParticipatingUsers = await _userManager.Users.Where(u => u.IsActive).ToListAsync(),
                 IsEditable = week.CanVote,
                 UserComments = await _commentRepository.GetCommentsForWeek((int) weekId)
             };
diff --git a/FoodPicker.Web/Views/Auth/Login.cshtml b/FoodPicker.Web/Views/Auth/Login.cshtml
index 9d6f96d..956812f 100644
--- a/FoodPicker.Web/Views/Auth/Login.cshtml
+++ b/FoodPicker.Web/Views/Auth/Login.cshtml
@@ -1,11 +1,11 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.EntityFrameworkCore
 @model FoodPicker.Web.Controllers.AuthController.LoginViewModel
-@inject UserManager<ApplicationUser> _userManager
+@inject UserManager<ApplicationUser> UserManager
 
 <form method="post">
     @{
-        var users = await _userManager.Users.ToListAsync();
+        var users = await UserManager.Users.Where(u => u.IsActive).ToListAsync();
     }
     <div class="mb-3">
         <label asp-for="UserId"></label>
@@ -13,9 +13,10 @@
             <option value="null">-- Select --</option>
             @foreach (var user in users)
             {
-                <option value="@user.Id" data-isadmin="@(await _userManager.IsInRoleAsync(user, "Admin"))">@user.UserName</option>
+                <option value="@user.Id" data-isadmin="@(await UserManager.IsInRoleAsync(user, "Admin"))">@user.UserName</option>
             }
         </select>
+        <span asp-validation-for="UserId" class="text-danger"></span>
     </div>
     
     <div class="mb-3 d-none" id="password-field">
diff --git a/FoodPicker.Web/Views/User/CreateOrEdit.cshtml b/FoodPicker.Web/Views/User/CreateOrEdit.cshtml
index b4c6dde..83fc34c 100644
--- a/FoodPicker.Web/Views/User/CreateOrEdit.cshtml
+++ b/FoodPicker.Web/Views/User/CreateOrEdit.cshtml
@@ -31,11 +31,15 @@
     </div>
     <div class="mb-3 form-check">
         <input asp-for="VoteIsRequired" type="checkbox" class="form-check-input"/>
-        <label asp-for="VoteIsRequired" class="form-check-label"></label>
+        <label asp-for="VoteIsRequired" class="form-check-label">Vote is Required?</label>
     </div>
     <div class="mb-3 form-check">
         <input asp-for="IsAdmin" type="checkbox" class="form-check-input"/>
-        <label asp-for="IsAdmin" class="form-check-label"></label>
+        <label asp-for="IsAdmin" class="form-check-label">Is Admin?</label>
+    </div>
+    <div class="mb-3 form-check">
+        <input asp-for="IsActive" type="checkbox" class="form-check-input"/>
+        <label asp-for="IsActive" class="form-check-label">Is Active?</label>
     </div>
     <button type="submit" class="btn btn-primary">Save</button>
 </form>
diff --git a/FoodPicker.Web/Views/User/List.cshtml b/FoodPicker.Web/Views/User/List.cshtml
index d5bff93..4a97917 100644
--- a/FoodPicker.Web/Views/User/List.cshtml
+++ b/FoodPicker.Web/Views/User/List.cshtml
@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Identity
 @model List<ApplicationUser>
-@inject UserManager<ApplicationUser> _userManager
+@inject UserManager<ApplicationUser> UserManager
 
 @{
     ViewBag.Title = "User List";
@@ -16,6 +16,7 @@
         <tr>
             <th>Name</th>
             <th>Username</th>
+            <th>Is Active?</th>
             <th>Is Admin?</th>
             <th>Vote Required?</th>
             <th>Actions</th>
@@ -27,7 +28,8 @@
             <tr>
                 <td>@user.Name</td>
                 <td>@user.UserName</td>
-                <td>@((await _userManager.IsInRoleAsync(user, "Admin")) ? "Yes" : "No")</td>
+                <td>@(user.IsActive ? "Yes" : "No")</td>
+                <td>@((await UserManager.IsInRoleAsync(user, "Admin")) ? "Yes" : "No")</td>
                 <td>@(user.VoteIsRequired ? "Yes" : "No")</td>
                 <td>
                     <a asp-route="UserEdit" asp-route-id="@user.Id">Edit</a>