diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index 7acc341f2..f0d259e22 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -9,6 +9,7 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
     $scope.error = null;
     $scope.provider = '';
     $scope.showDNSSetup = false;
+    // keep in sync with certs.js
     $scope.dnsProvider = [
         { name: 'AWS Route53', value: 'route53' },
         { name: 'Digital Ocean', value: 'digitalocean' },
diff --git a/webadmin/src/views/certs.js b/webadmin/src/views/certs.js
index d798a5629..d0c20b9bd 100644
--- a/webadmin/src/views/certs.js
+++ b/webadmin/src/views/certs.js
@@ -6,11 +6,13 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
     $scope.config = Client.getConfig();
     $scope.dnsConfig = null;
 
+    // keep in sync with setupdns.js
     $scope.dnsProvider = [
-        { name: 'Manual/Wildcard', value: 'manual' },
-        { name: 'No-op', value: 'noop' },
         { name: 'AWS Route53', value: 'route53' },
-        { name: 'Digital Ocean', value: 'digitalocean' }
+        { name: 'Digital Ocean', value: 'digitalocean' },
+        { name: 'Wildcard', value: 'wildcard' },
+        { name: 'Manual (not recommended)', value: 'manual' },
+        { name: 'No-op (only for development)', value: 'noop' }
     ];
 
     $scope.defaultCert = {
@@ -119,6 +121,12 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
             token: $scope.dnsCredentials.digitalOceanToken
         };
 
+        // special case the wildcard provider
+        if (data.provider === 'wildcard') {
+            data.provider = 'manual';
+            data.wildcard = true;
+        }
+
         var func;
         if (migrateDomain) {
             data.domain = $scope.dnsCredentials.customDomain;