diff --git a/webadmin/src/setupdns.html b/webadmin/src/setupdns.html
index 2c1b4b982..54ec5abf6 100644
--- a/webadmin/src/setupdns.html
+++ b/webadmin/src/setupdns.html
@@ -88,7 +88,7 @@
                                 </div>
 
                                 <!-- Cloudflare -->
-                                <p>Cloudron only supports DNS management. Traffic will <b>not</b> go through the Cloudflare network.</p>
+                                <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>
diff --git a/webadmin/src/views/certs.html b/webadmin/src/views/certs.html
index 8cf2d333b..f7c9e456d 100644
--- a/webadmin/src/views/certs.html
+++ b/webadmin/src/views/certs.html
@@ -36,7 +36,7 @@
                         </div>
 
                         <!-- Cloudflare -->
-                        <p>Cloudron only supports DNS management. Traffic will <b>not</b> go through the Cloudflare network.</p>
+                        <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">