User module model bug fixes and upgrades.