Trying to fix issue when saving account