Use dedicated AccountCreation resource in client instead of merging it into Account.