diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 498869e24..6aa3c06be 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -30,6 +30,11 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         { name: 'Self-Signed', value: 'fallback' }, // this is not 'Custom' because we don't allow user to upload certs during setup phase
     ];
 
+    $scope.needsPort80 = function (dnsProvider, tlsProvider) {
+        return ((dnsProvider === 'manual' || dnsProvider === 'noop' || dnsProvider === 'wildcard') &&
+            (tlsProvider === 'letsencrypt-prod' || tlsProvider === 'letsencrypt-staging'));
+    };
+
     // If we migrate the api origin we have to poll the new location
     if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
 
diff --git a/src/setupdns.html b/src/setupdns.html
index 89270f87f..5de1be099 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -186,7 +186,7 @@
                                     <div class="form-group">
                                         <label class="control-label">Certificate Provider</label>
                                         <select class="form-control" ng-model="dnsCredentials.tlsConfig.provider" ng-options="a.value as a.name for a in tlsProvider" ng-disabled="dnsCredentials.busy"></select>
-                                        <small class="text-info" ng-show="dnsCredentials.tlsConfig.provider === 'letsencrypt-prod' || dnsCredentials.tlsConfig.provider === 'letsencrypt-staging'">Let's Encrypt requires your server to be reachable on port 80</small>
+                                        <small class="text-info" ng-show="needsPort80(dnsCredentials.provider, dnsCredentials.tlsConfig.provider)">Let's Encrypt requires your server to be reachable on port 80</small>
                                     </div>
                                 </div>
                                 <div class="text-center">
diff --git a/src/views/domains.html b/src/views/domains.html
index b2f469a49..f061a12b3 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -110,7 +110,7 @@
               <div class="form-group">
                 <label class="control-label">Certificate Provider</label>
                 <select class="form-control" ng-model="domainConfigure.tlsConfig.provider" ng-options="a.value as a.name for a in tlsProvider"></select>
-                <small class="text-info" ng-show="domainConfigure.tlsConfig.provider === 'letsencrypt-prod' || domainConfigure.tlsConfig.provider === 'letsencrypt-staging'">Let's Encrypt requires your server to be reachable on port 80</small>
+                <small class="text-info" ng-show="needsPort80(domainConfigure.provider, domainConfigure.tlsConfig.provider)">Let's Encrypt requires your server to be reachable on port 80</small>
               </div>
 
               <!-- Fallback certificate -->
diff --git a/src/views/domains.js b/src/views/domains.js
index 84dd8b322..b60b01958 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -48,6 +48,11 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         }
     };
 
+    $scope.needsPort80 = function (dnsProvider, tlsProvider) {
+        return ((dnsProvider === 'manual' || dnsProvider === 'noop' || dnsProvider === 'wildcard') &&
+            (tlsProvider === 'letsencrypt-prod' || tlsProvider === 'letsencrypt-staging'));
+    };
+
     function readFileLocally(obj, file, fileName) {
         return function (event) {
             $scope.$apply(function () {