Fix: update account fields to be inline with service