Made the create-account step work (with occasional fails)