Fixes user model with Colby's changes.
Please enter the commit message for your changes. Lines starting