Avoid clearing credentials

When creating on-demand instances, all options should be considered. Otherwise any attempt to use another token with otherwise similar options will fail.