Upgrade user module and bug fixes