[PATCH 11/22] accounts_* remediation update