CS-3: Improved custom user model