Fixed the make_account to accept data from the billing address when it's not blank, otherwise default to underscores.