Code Review PR

Shouldn't the User model take care of this?