Patches create account issue OOIION-1581

@jamie-cyber1 please review and merge