diff --git a/webadmin/src/views/certs.html b/webadmin/src/views/certs.html
index 105de8e4f..e3ce608b9 100644
--- a/webadmin/src/views/certs.html
+++ b/webadmin/src/views/certs.html
@@ -14,14 +14,22 @@
                             <input type="text" class="form-control" ng-model="dnsCredentials.customDomain" id="customDomainId" name="customDomainId" ng-disabled="dnsCredentials.busy" ng-minlength="4" ng-maxlength="128" placeholder="example.com" required autofocus>
                         </div>
 
-                        <div class="form-group" ng-class="{ 'has-error': false }">
+                        <!-- Route53 -->
+                        <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'route53'">
                             <label class="control-label" for="dnsCredentialsAccessKeyId">Access Key Id</label>
-                            <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" id="dnsCredentialsAccessKeyId" name="accessKeyId" ng-disabled="dnsCredentials.busy" ng-minlength="16" ng-maxlength="32" required>
+                            <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" id="dnsCredentialsAccessKeyId" name="accessKeyId" ng-disabled="dnsCredentials.busy" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'">
                         </div>
-                        <div class="form-group" ng-class="{ 'has-error': false }">
+                        <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'route53'">
                             <label class="control-label" for="dnsCredentialsSecretAccessKey">Secret Access Key</label>
-                            <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" id="dnsCredentialsSecretAccessKey" name="secretAccessKey" ng-disabled="dnsCredentials.busy" required>
+                            <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" id="dnsCredentialsSecretAccessKey" name="secretAccessKey" ng-disabled="dnsCredentials.busy" ng-required="dnsCredentials.provider === 'route53'">
                         </div>
+
+                        <!-- DigitalOcean -->
+                        <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'digitalocean'">
+                            <label class="control-label" for="dnsCredentialsDigitalOceanToken">API Token</label>
+                            <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" id="dnsCredentialsDigitalOceanToken" name="digitalOceanToken" ng-disabled="dnsCredentials.busy" ng-required="dnsCredentials.provider === 'digitalocean'">
+                        </div>
+
                         <div class="form-group" ng-class="{ 'has-error': false }" ng-if="config.fqdn !== dnsCredentials.customDomain">
                             <label class="control-label" for="dnsCredentialsPassword">Provide your password to confirm this action</label>
                             <input type="password" class="form-control" ng-model="dnsCredentials.password" id="dnsCredentialsPassword" name="password" ng-disabled="dnsCredentials.busy" required>
@@ -77,12 +85,12 @@
                 </tr>
                 <tr ng-show="config.isCustomDomain && dnsConfig.provider === 'route53'">
                     <td class="text-muted" style="vertical-align: top;">Secret Access Key</td>
-                    <td class="text-right" style="vertical-align: top; white-space: nowrap;" ng-click-reveal="{{ dnsConfig.secretAccessKey }}"><i>hidden</i></td>
+                    <td class="text-right" style="vertical-align: top; white-space: nowrap;" ng-click-reveal="dnsConfig.secretAccessKey"><i>hidden</i></td>
                 </tr>
 
                 <tr ng-show="config.isCustomDomain && dnsConfig.provider === 'digitalocean'">
                     <td class="text-muted" style="vertical-align: top;">API Token</td>
-                    <td class="text-right" style="vertical-align: top; white-space: nowrap;" ng-click-reveal="{{ dnsConfig.token }}"><i>hidden</i></td>
+                    <td class="text-right" style="vertical-align: top; white-space: nowrap;" ng-click-reveal="dnsConfig.token"><i>hidden</i></td>
                 </tr>
 
                 <!-- add some space -->
diff --git a/webadmin/src/views/certs.js b/webadmin/src/views/certs.js
index dfdf5b6ad..be34dc419 100644
--- a/webadmin/src/views/certs.js
+++ b/webadmin/src/views/certs.js
@@ -33,6 +33,7 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         customDomain: '',
         accessKeyId: '',
         secretAccessKey: '',
+        digitalOceanToken: '',
         provider: 'route53',
         password: ''
     };
@@ -107,7 +108,8 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         var data = {
             provider: $scope.dnsCredentials.provider,
             accessKeyId: $scope.dnsCredentials.accessKeyId,
-            secretAccessKey: $scope.dnsCredentials.secretAccessKey
+            secretAccessKey: $scope.dnsCredentials.secretAccessKey,
+            token: $scope.dnsCredentials.digitalOceanToken
         };
 
         var func;
@@ -126,6 +128,7 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
 
                 $scope.dnsConfig.accessKeyId = $scope.dnsCredentials.accessKeyId;
                 $scope.dnsConfig.secretAccessKey = $scope.dnsCredentials.secretAccessKey;
+                $scope.dnsConfig.token = $scope.dnsCredentials.digitalOceanToken;
 
                 $('#dnsCredentialsModal').modal('hide');
 
@@ -143,9 +146,11 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         $scope.dnsCredentials.success = false;
         $scope.dnsCredentials.error = null;
 
+        $scope.dnsCredentials.provider = '';
         $scope.dnsCredentials.customDomain = '';
         $scope.dnsCredentials.accessKeyId = '';
         $scope.dnsCredentials.secretAccessKey = '';
+        $scope.dnsCredentials.digitalOceanToken = '';
         $scope.dnsCredentials.password = '';
 
         $scope.dnsCredentialsForm.$setPristine();
@@ -160,6 +165,8 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         $scope.dnsCredentials.customDomain = $scope.dnsConfig.accessKeyId ? $scope.config.fqdn : '';
         $scope.dnsCredentials.accessKeyId = $scope.dnsConfig.accessKeyId;
         $scope.dnsCredentials.secretAccessKey = $scope.dnsConfig.secretAccessKey;
+        $scope.dnsCredentials.digitalOceanToken = $scope.dnsConfig.token;
+        $scope.dnsCredentials.provider = $scope.dnsConfig.provider === 'caas' ? 'route53' : $scope.dnsConfig.provider;
 
         $('#dnsCredentialsModal').modal('show');
     };