Completed conversion away from custom user to standard auth.User