diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs
index f877cf0bc0..790dce133b 100644
--- a/src/Tgstation.Server.Host/Controllers/UserController.cs
+++ b/src/Tgstation.Server.Host/Controllers/UserController.cs
@@ -221,6 +221,9 @@ namespace Tgstation.Server.Host.Controllers
 
 			if (model.Password != null)
 			{
+				if (model.SystemIdentifier != null)
+					return BadRequest(new ErrorMessageResponse(ErrorCode.UserMismatchPasswordSid));
+
 				var result = TrySetPassword(originalUser, model.Password, false);
 				if (result != null)
 					return result;