fix current_account missing issue