diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 6a3f3adcc..5e21c9102 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -100,6 +100,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         gandiApiKey: '',
         cloudflareEmail: '',
         cloudflareToken: '',
+        cloudflareTokenType: 'GlobalApiKey',
         godaddyApiKey: '',
         godaddyApiSecret: '',
         nameComUsername: '',
@@ -183,6 +184,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         } else if (provider === 'cloudflare') {
             config.email = $scope.dnsCredentials.cloudflareEmail;
             config.token = $scope.dnsCredentials.cloudflareToken;
+            config.tokenType = $scope.dnsCredentials.cloudflareTokenType;
         } else if (provider === 'namecom') {
             config.username = $scope.dnsCredentials.nameComUsername;
             config.token = $scope.dnsCredentials.nameComToken;
diff --git a/src/setupdns.html b/src/setupdns.html
index 118f11496..e43ba1463 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -125,12 +125,21 @@
 
                                 <!-- Cloudflare -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareToken.$dirty && dnsCredentialsForm.cloudflareToken.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
-                                    <label class="control-label">Global API Key</label>
-                                    <input type="text" class="form-control" ng-model="dnsCredentials.cloudflareToken" name="cloudflareToken" placeholder="Global API Key" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
+                                    <label class="control-label">Token Type</label>
+                                    <select class="form-control" ng-model="dnsCredentials.cloudflareTokenType">
+                                      <option value="GlobalApiKey">Global API Key</option>
+                                      <option value="ApiToken">API Token</option>
+                                    </select>
+                                  </div>
+
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareToken.$dirty && dnsCredentialsForm.cloudflareToken.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
+                                    <label class="control-label" ng-show="dnsCredentials.cloudflareTokenType === 'GlobalApiKey'">Global API Key</label>
+                                    <label class="control-label" ng-show="dnsCredentials.cloudflareTokenType === 'ApiToken'">Api Token</label>
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.cloudflareToken" name="cloudflareToken" placeholder="API Key/Token" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                                 </div>
-                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareEmail.$dirty && dnsCredentialsForm.cloudflareEmail.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareEmail.$dirty && dnsCredentialsForm.cloudflareEmail.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare' && dnsCredentials.cloudflareTokenType === 'GlobalApiKey'">
                                     <label class="control-label">Cloudflare Email</label>
-                                    <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
+                                    <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="dnsCredentials.provider === 'cloudflare' && dnsCredentials.cloudflareTokenType === 'GlobalApiKey'" ng-disabled="dnsCredentials.busy">
                                 </div>
 
                                 <!-- Name.com -->
diff --git a/src/views/domains.html b/src/views/domains.html
index e4cecd458..b23612476 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -67,12 +67,21 @@
 
             <!-- Cloudflare -->
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
-              <label class="control-label">Global API Key</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.cloudflareToken" name="cloudflareToken" placeholder="Global API Key" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
+              <label class="control-label">Token Type</label>
+              <select class="form-control" ng-model="domainConfigure.cloudflareTokenType">
+                <option value="GlobalApiKey">Global API Key</option>
+                <option value="ApiToken">API Token</option>
+              </select>
             </div>
+
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
+              <label class="control-label" ng-show="domainConfigure.cloudflareTokenType === 'GlobalApiKey'">Global API Key</label>
+              <label class="control-label" ng-show="domainConfigure.cloudflareTokenType === 'ApiToken'">Api Token</label>
+              <input type="text" class="form-control" ng-model="domainConfigure.cloudflareToken" name="cloudflareToken" placeholder="API Key/Token" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
+            </div>
+            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare' && domainConfigure.cloudflareTokenType === 'GlobalApiKey'">
               <label class="control-label">Cloudflare Email</label>
-              <input type="email" class="form-control" ng-model="domainConfigure.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
+              <input type="email" class="form-control" ng-model="domainConfigure.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="domainConfigure.provider === 'cloudflare' && domainConfigure.cloudflareTokenType === 'GlobalApiKey'" ng-disabled="domainConfigure.busy">
             </div>
 
             <!-- Name.com -->
diff --git a/src/views/domains.js b/src/views/domains.js
index f7c877d63..dd1d331d6 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -174,6 +174,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                 $scope.domainConfigure.gandiApiKey = domain.provider === 'gandi' ? domain.config.token : '';
                 $scope.domainConfigure.cloudflareToken = domain.provider === 'cloudflare' ? domain.config.token : '';
                 $scope.domainConfigure.cloudflareEmail = domain.provider === 'cloudflare' ? domain.config.email : '';
+                $scope.domainConfigure.cloudflareTokenType = domain.provider === 'cloudflare' ? domain.config.tokenType : 'GlobalApiKey';
 
                 $scope.domainConfigure.godaddyApiKey = domain.provider === 'godaddy' ? domain.config.apiKey : '';
                 $scope.domainConfigure.godaddyApiSecret = domain.provider === 'godaddy' ? domain.config.apiSecret : '';
@@ -304,6 +305,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
             $scope.domainConfigure.godaddyApiSecret = '';
             $scope.domainConfigure.cloudflareToken = '';
             $scope.domainConfigure.cloudflareEmail = '';
+            $scope.domainConfigure.cloudflareTokenType = 'GlobalApiKey';
             $scope.domainConfigure.nameComToken = '';
             $scope.domainConfigure.nameComUsername = '';
             $scope.domainConfigure.namecheapApiKey = '';