[MERGE] fixes in account_followup