Changed to custom user model