User category assignement fixes