[MERGE] account_followup: small fixes in views