Modified to fit custom user model