Also we should start getting rid of the `username` concept, how about using `identifier` or simply `id` instead? eg. here we could have `idFieldName`