Fix up user object and make sure storage works well