Prevent -0001 -xxxx Certificate Suffixes

Hopefully the order of the parameters doesn’t matter. :grin: Thanks!