diff --git a/src/Tgstation.Server.Api/Models/Administration.cs b/src/Tgstation.Server.Api/Models/Administration.cs
index 7f04e2d428..640a5c65ac 100644
--- a/src/Tgstation.Server.Api/Models/Administration.cs
+++ b/src/Tgstation.Server.Api/Models/Administration.cs
@@ -24,11 +24,5 @@ namespace Tgstation.Server.Api.Models
 		/// </summary>
 		[Permissions(WriteRight = AdministrationRights.ChangeVersion)]
 		public Version CurrentVersion { get; set; }
-
-		/// <summary>
-		/// Users in the <see cref="Internal.ServerSettings.SystemAuthenticationGroup"/>
-		/// </summary>
-		[Permissions(DenyWrite = true)]
-		public IReadOnlyList<User> Users { get; set; }
 	}
 }
diff --git a/src/Tgstation.Server.Api/Rights/AdministrationRights.cs b/src/Tgstation.Server.Api/Rights/AdministrationRights.cs
index bc7d302397..c8992b3575 100644
--- a/src/Tgstation.Server.Api/Rights/AdministrationRights.cs
+++ b/src/Tgstation.Server.Api/Rights/AdministrationRights.cs
@@ -13,9 +13,9 @@ namespace Tgstation.Server.Api.Rights
 		/// </summary>
 		None = 0,
 		/// <summary>
-		/// User can change <see cref="Models.Internal.ServerSettings.SystemAuthenticationGroup"/>
+		/// User can change <see cref="Models.Internal.ServerSettings.UpstreamRepository"/>
 		/// </summary>
-		ChangeAuthenticationGroup = 1,
+		SetUpstreamRepository = 1,
 		/// <summary>
 		/// User can change <see cref="Models.Internal.ServerSettings.EnableTelemetry"/>
 		/// </summary>
@@ -31,10 +31,6 @@ namespace Tgstation.Server.Api.Rights
 		/// <summary>
 		/// User can change <see cref="Models.Administration.CurrentVersion"/>
 		/// </summary>
-		ChangeVersion = 16,
-		/// <summary>
-		/// User can change <see cref="Models.Internal.ServerSettings.UpstreamRepository"/>
-		/// </summary>
-		SetUpstreamRepository = 32
+		ChangeVersion = 16
 	}
 }
diff --git a/src/Tgstation.Server.Host/Models/DatabaseContext.cs b/src/Tgstation.Server.Host/Models/DatabaseContext.cs
index 8bb7a69218..5ca0997c1e 100644
--- a/src/Tgstation.Server.Host/Models/DatabaseContext.cs
+++ b/src/Tgstation.Server.Host/Models/DatabaseContext.cs
@@ -109,7 +109,6 @@ namespace Tgstation.Server.Host.Models
 
 			modelBuilder.Entity<RevisionInformation>().HasIndex(x => x.Commit).IsUnique();
 			var user = modelBuilder.Entity<User>();
-			user.HasIndex(x => new { x.CanonicalName, x.SystemIdentifier }).IsUnique();
 			user.HasIndex(x => x.CanonicalName).IsUnique();
 			user.HasOne(x => x.CreatedBy).WithMany(x => x.CreatedUsers).OnDelete(DeleteBehavior.Restrict);
 
diff --git a/src/Tgstation.Server.Host/Security/ISystemIdentity.cs b/src/Tgstation.Server.Host/Security/ISystemIdentity.cs
index ff2dc3482c..fecf36a60a 100644
--- a/src/Tgstation.Server.Host/Security/ISystemIdentity.cs
+++ b/src/Tgstation.Server.Host/Security/ISystemIdentity.cs
@@ -20,11 +20,6 @@ namespace Tgstation.Server.Host.Security
 		/// </summary>
 		string Username { get; }
 
-		/// <summary>
-		/// Groups the user is in
-		/// </summary>
-		IEnumerable<string> Groups { get; }
-
 		/// <summary>
 		/// Clone the <see cref="ISystemIdentity"/> creating another copy that must have <see cref="IDisposable.Dispose"/> called on it
 		/// </summary>