diff --git a/Core/Resgrid.Services/LimitsService.cs b/Core/Resgrid.Services/LimitsService.cs
index 8f7f6e5e..9e00c762 100644
--- a/Core/Resgrid.Services/LimitsService.cs
+++ b/Core/Resgrid.Services/LimitsService.cs
@@ -206,7 +206,14 @@ async Task<DepartmentLimits> getCurrentPlanForDepartmentAsync()
 						return limits;
 					}
 				}
-				else if (plan == null || plan.PlanId == 1)
+				else if ((!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey)) && plan.PlanId == 1)
+				{
+					limits.PersonnelLimit = plan.GetLimitForTypeAsInt(PlanLimitTypes.Personnel);
+					limits.UnitsLimit = plan.GetLimitForTypeAsInt(PlanLimitTypes.Units);
+
+					return limits;
+				}
+				else if (plan == null)
 				{
 					limits.PersonnelLimit = 10;
 					limits.UnitsLimit = 10;
diff --git a/Providers/Resgrid.Providers.MigrationsPg/Sql/M0001_InitialMigration.sql b/Providers/Resgrid.Providers.MigrationsPg/Sql/M0001_InitialMigration.sql
index eb975d1e..2786a048 100644
Binary files a/Providers/Resgrid.Providers.MigrationsPg/Sql/M0001_InitialMigration.sql and b/Providers/Resgrid.Providers.MigrationsPg/Sql/M0001_InitialMigration.sql differ
diff --git a/Repositories/Resgrid.Repositories.DataRepository/ScheduledTasksRepository.cs b/Repositories/Resgrid.Repositories.DataRepository/ScheduledTasksRepository.cs
index 6d9a0b87..c6b4fa3d 100644
--- a/Repositories/Resgrid.Repositories.DataRepository/ScheduledTasksRepository.cs
+++ b/Repositories/Resgrid.Repositories.DataRepository/ScheduledTasksRepository.cs
@@ -57,13 +57,13 @@ public async Task<IEnumerable<ScheduledTask>> GetAllActiveTasksForTypesAsync(Lis
 					var knownDepartments = await db.QueryAsync<ScheduledTask>(@"SELECT st.*, d.departmentid as departmentid, d.timezone as departmenttimezone
 																					FROM scheduledtasks st
 																					INNER JOIN departments d ON d.departmentid = st.departmentid
-																					WHERE st.departmentid > 0 AND st.active = 1 AND st.tasktype = any (@types)", new { types = types });
+																					WHERE st.departmentid > 0 AND st.active = true AND st.tasktype = any (@types)", new { types = types });
 
 					var unknownDepartments = await db.QueryAsync<ScheduledTask>(@"SELECT st.*, d.departmentid as departmentid, d.timezone as departmenttimezone
 																					FROM scheduledtasks st
 																					INNER JOIN departmentmembers dm ON dm.userid = st.userid
 																					INNER JOIN departments d ON d.departmentid = dm.departmentid
-																					WHERE st.departmentid = 0 AND st.active = 1 AND st.tasktype = any (@types)", new { types = types });
+																					WHERE st.departmentid = 0 AND st.active = true AND st.tasktype = any (@types)", new { types = types });
 
 					return knownDepartments.Concat(unknownDepartments);
 				}
diff --git a/Web/Resgrid.Web/Areas/User/Controllers/PersonnelController.cs b/Web/Resgrid.Web/Areas/User/Controllers/PersonnelController.cs
index 18afec61..d1c7c755 100644
--- a/Web/Resgrid.Web/Areas/User/Controllers/PersonnelController.cs
+++ b/Web/Resgrid.Web/Areas/User/Controllers/PersonnelController.cs
@@ -483,7 +483,7 @@ public async Task<IActionResult> AddPerson(AddPersonModel model, IFormCollection
 
 			if (ModelState.IsValid)
 			{
-				var user = new IdentityUser { UserName = model.Username, Email = model.Email, SecurityStamp = Guid.NewGuid().ToString() };
+				var user = new IdentityUser { UserName = model.Username, Email = model.Email, SecurityStamp = Guid.NewGuid().ToString().ToUpper() };
 				var result = await _userManager.CreateAsync(user, model.NewPassword);
 				if (result.Succeeded)
 				{
@@ -529,7 +529,7 @@ public async Task<IActionResult> AddPerson(AddPersonModel model, IFormCollection
 						if (roles.Any())
 							await _personnelRolesService.SetRolesForUserAsync(DepartmentId, user.UserId, roles, cancellationToken);
 					}
-					
+
 					_userProfileService.ClearAllUserProfilesFromCache(DepartmentId);
 					_departmentsService.InvalidateDepartmentUsersInCache(DepartmentId);
 					_departmentsService.InvalidatePersonnelNamesInCache(DepartmentId);