Account data not saved after revamp

Other Merge Gardens issues: