More User model stuff

Strange that these files were not seen with the previous two commits?