diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index 0f5111ccd..4976a345e 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -41,7 +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: 'Cloudflare (DNS only)', value: 'cloudflare' },
         { name: 'Wildcard', value: 'wildcard' },
         { name: 'Manual (not recommended)', value: 'manual' },
         { name: 'No-op (only for development)', value: 'noop' }
diff --git a/webadmin/src/setupdns.html b/webadmin/src/setupdns.html
index 54ec5abf6..de14452d0 100644
--- a/webadmin/src/setupdns.html
+++ b/webadmin/src/setupdns.html
@@ -88,12 +88,11 @@
                                 </div>
 
                                 <!-- Cloudflare -->
-                                <p ng-show="dnsCredentials.provider === 'cloudflare'">Cloudron only supports DNS management. Traffic will <b>not</b> go through the Cloudflare network.</p>
                                 <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 Key" 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'">
-                                    <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" name="cloudflareEmail" placeholder="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'" ng-disabled="dnsCredentials.busy">
                                     <br/>
                                     <span>{{ dnsCredentials.domain || 'The domain' }} must be hosted on <a href="https://www.cloudflare.com" target="_blank">Cloudflare</a>.</span>
                                 </div>
diff --git a/webadmin/src/views/certs.html b/webadmin/src/views/certs.html
index f7c9e456d..9797d14b1 100644
--- a/webadmin/src/views/certs.html
+++ b/webadmin/src/views/certs.html
@@ -36,14 +36,13 @@
                         </div>
 
                         <!-- Cloudflare -->
-                        <p ng-show="dnsCredentials.provider === 'cloudflare'">Cloudron only supports DNS management. Traffic will <b>not</b> go through the Cloudflare network.</p>
                         <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'cloudflare'">
                             <label class="control-label" for="dnsCredentialsCloudflareToken">Cloudflare token</label>
                             <input type="text" class="form-control" ng-model="dnsCredentials.cloudflareToken" id="dnsCredentialsCloudflareToken" name="cloudflareToken" placeholder="API Key" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                         </div>
                         <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'cloudflare'">
                             <label class="control-label" for="dnsCredentialsCloudflareEmail">Cloudflare email</label>
-                            <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" id="dnsCredentialsCloudflareEmail" name="cloudflareEmail" placeholder="Email" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
+                            <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" id="dnsCredentialsCloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                         </div>
 
                         <!-- all provider -->
diff --git a/webadmin/src/views/certs.js b/webadmin/src/views/certs.js
index 95b527e67..0783caeaf 100644
--- a/webadmin/src/views/certs.js
+++ b/webadmin/src/views/certs.js
@@ -10,7 +10,7 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
     $scope.dnsProvider = [
         { name: 'AWS Route53', value: 'route53' },
         { name: 'Digital Ocean', value: 'digitalocean' },
-        { name: 'Cloudflare', value: 'cloudflare' },
+        { name: 'Cloudflare (DNS only)', value: 'cloudflare' },
         { name: 'Wildcard', value: 'wildcard' },
         { name: 'Manual (not recommended)', value: 'manual' },
         { name: 'No-op (only for development)', value: 'noop' }