More user save issues
User error fix