diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index 7bf195759..0f5111ccd 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -41,6 +41,7 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
     $scope.dnsProvider = [
         { name: 'AWS Route53', value: 'route53' },
         { name: 'Digital Ocean', value: 'digitalocean' },
+        { name: 'Cloudflare', value: 'cloudflare' },
         { name: 'Wildcard', value: 'wildcard' },
         { name: 'Manual (not recommended)', value: 'manual' },
         { name: 'No-op (only for development)', value: 'noop' }
@@ -64,9 +65,6 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
             domain: $scope.dnsCredentials.domain,
             zoneName: $scope.explicitZone,
             provider: $scope.dnsCredentials.provider,
-            accessKeyId: $scope.dnsCredentials.accessKeyId,
-            secretAccessKey: $scope.dnsCredentials.secretAccessKey,
-            token: $scope.dnsCredentials.digitalOceanToken,
             providerToken: $scope.instanceId
         };
 
@@ -76,6 +74,16 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
             data.wildcard = true;
         }
 
+        if (data.provider === 'route53') {
+            data.accessKeyId = $scope.dnsCredentials.accessKeyId;
+            data.secretAccessKey = $scope.dnsCredentials.secretAccessKey;
+        } else if (data.provider === 'digitalocean') {
+            data.token = $scope.dnsCredentials.digitalOceanToken;
+        } else if (data.provider === 'cloudflare') {
+            data.email = $scope.dnsCredentials.cloudflareEmail;
+            data.token = $scope.dnsCredentials.cloudflareToken;
+        }
+
         Client.setupDnsConfig(data, function (error) {
             if (error && error.statusCode === 403) {
                 $scope.dnsCredentials.busy = false;
diff --git a/webadmin/src/setupdns.html b/webadmin/src/setupdns.html
index dc4e446a0..f796e9497 100644
--- a/webadmin/src/setupdns.html
+++ b/webadmin/src/setupdns.html
@@ -89,12 +89,12 @@
 
                                 <!-- Cloudflare -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareToken.$dirty && dnsCredentialsForm.cloudflareToken.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
-                                    <input type="text" class="form-control" ng-model="dnsCredentials.cloudflareToken" name="cloudflareToken" placeholder="API Token" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.cloudflareToken" name="cloudflareToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                                 </div>
-                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.secretAccessKey.$dirty && dnsCredentialsForm.secretAccessKey.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
-                                    <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" placeholder="Secret Access Key" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareEmail.$dirty && dnsCredentialsForm.cloudflareEmail.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
+                                    <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" name="cloudflareEmail" placeholder="Email" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                                     <br/>
-                                    <span>{{ dnsCredentials.domain || 'The domain' }} must be hosted on <a href="https://aws.amazon.com/route53/?nc2=h_m1" target="_blank">AWS Route53</a>.</span>
+                                    <span>{{ dnsCredentials.domain || 'The domain' }} must be hosted on <a href="https://www.cloudflare.com" target="_blank">Cloudflare</a>.</span>
                                 </div>
 
                                 <!-- Wildcard -->