Minor UserManager optimization