Fix certificate requests
Merge pull request #3815 from cpennington/ok-certificaties

Fix certificate requests