Small changes to the user save code