Updated to not clear the account when saving