fixed replaceAccount