Bug fix for incorrect account creation.