Updated to use django custom user model functionality