Switched also account creation to use data-api for validation using Chris' approach.