Fix for user preference saving issues