User module Upgrade/Bug fixes