Fix for saving by public user