More tweaks to the user model