Fix persistence issue with user