Follow up on accountpreferences review

Follow-up on the remaining comments on #2767.