corrected account flow management