[FIX] account_followup: use %s string formatting to avoid concat None values
[MERGE] forward port of branch 7.0 up to b4d3701