diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index cca60a5d5..0531bf57c 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -26,8 +26,8 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
         provider: 'route53'
     };
 
-    $scope.setDNSCredentials = function () {
-        $scope.busy = true;
+    $scope.setDnsCredentials = function () {
+        $scope.dnsCredentials.busy = true;
 
         var data = {
             domain: $scope.dnsCredentials.domain,
@@ -45,11 +45,13 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
 
         Client.setupDnsConfig(data, function (error) {
             if (error) {
-                $scope.busy = false;
+                $scope.dnsCredentials.busy = false;
                 $scope.dnsCredentials.error = error.message;
                 return;
             }
 
+            $scope.busy = true;
+
             setTimeout(function () {
                 // TODO wait until domain is propagated and cert got acquired
                 window.location.href = 'https://my.' + $scope.dnsCredentials.domain + '/setup.html';
diff --git a/webadmin/src/setupdns.html b/webadmin/src/setupdns.html
index 1e962ac67..fdf2a3cb4 100644
--- a/webadmin/src/setupdns.html
+++ b/webadmin/src/setupdns.html
@@ -45,7 +45,7 @@
                                     <h1>Domain Setup</h1>
                                     <h3>Specify the domain for your Cloudron</h3>
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" ng-minlength="4" ng-maxlength="128" placeholder="example.com" required autofocus>
+                                        <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" ng-minlength="4" ng-maxlength="128" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
                                     </div>
                                     <p>Apps will be installed on subdomains of that domain.</p>
                                 </div>
@@ -55,27 +55,37 @@
                                     <h3>DNS Provider Configuration</h3>
                                     <p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
 
-                                    <div class="form-group" ng-show="dnsConfig.provider !== 'caas'">
-                                        <select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider"></select>
+                                    <div class="form-group">
+                                        <select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider" ng-disabled="dnsCredentials.busy"></select>
                                     </div>
 
                                     <!-- Route53 -->
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.accessKeyId.$dirty && dnsCredentialsForm.accessKeyId.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" name="accessKeyId" placeholder="Access Key Id" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'">
+                                        <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" name="accessKeyId" placeholder="Access Key Id" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'" ng-disabled="dnsCredentials.busy">
                                     </div>
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.secretAccessKey.$dirty && dnsCredentialsForm.secretAccessKey.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" placeholder="Secret Access Key" ng-required="dnsCredentials.provider === 'route53'">
+                                        <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" placeholder="Secret Access Key" ng-required="dnsCredentials.provider === 'route53'" ng-disabled="dnsCredentials.busy">
                                     </div>
 
                                     <!-- DigitalOcean -->
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$dirty && dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'">
+                                        <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'" ng-disabled="dnsCredentials.busy">
                                     </div>
+
+                                    <!-- Wildcard -->
+                                    <p ng-show="dnsCredentials.provider === 'wildcard'">
+                                        Setup a wildcard DNS A record manually. TODO more help text.
+                                    </p>
+
+                                    <!-- Manual -->
+                                    <p ng-show="dnsCredentials.provider === 'manual'">
+                                        All DNS records have to be setup manually. TODO more help text also for my.domain.com.
+                                    </p>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col-md-12 text-center">
-                                    <input type="submit" class="btn btn-primary" ng-disabled="dnsCredentialsForm.$invalid" value="Done"/>
+                                    <button type="submit" class="btn btn-primary" ng-disabled="dnsCredentialsForm.$invalid"/><i class="fa fa-spinner fa-pulse" ng-show="dnsCredentials.busy"></i> Done</button>
                                 </div>
                             </div>
                         </form>