diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 783f99b85..247d52b08 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -214,6 +214,37 @@
     </div>
 </div>
 
+<div style="max-width: 600px; margin: 0 auto;" ng-show="user.admin && config.isCustomDomain">
+    <div class="text-left">
+        <h3>DNS Credentials</h3>
+    </div>
+</div>
+
+<div class="card" style="margin-bottom: 15px;" ng-show="user.admin && config.isCustomDomain">
+    <div class="row">
+        <div class="col-md-12">
+            <p>Currently only Amazon <a href="https://aws.amazon.com/route53/">Route53</a> is supported. The security credentials have to have access to the relevant Route53 zones.</p>
+            <form name="dnsCredentialsForm" ng-submit="setDnsCredentials()">
+                <fieldset>
+                    <div class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</div>
+                    <div class="text-success text-center" ng-show="dnsCredentials.success"><b>Update successful</b></div>
+
+                    <div class="form-group" ng-class="{ 'has-error': false }">
+                        <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>
+                    </div>
+                    <div class="form-group" ng-class="{ 'has-error': false }">
+                        <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>
+                    </div>
+
+                    <button type="submit" class="btn btn-outline btn-success pull-right" ng-disabled="dnsCredentialsForm.$invalid || busy"><i class="fa fa-spinner fa-pulse" ng-show="dnsCredentials.busy"></i> Save</button>
+                </fieldset>
+            </form>
+        </div>
+    </div>
+ </div>
+
 <div style="max-width: 600px; margin: 0 auto;" ng-show="user.admin">
     <div class="text-left">
         <h3>Developer Mode</h3>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index a495e4c7e..199f2e2b3 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -103,6 +103,15 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         keyFileName: ''
     };
 
+    $scope.dnsCredentials = {
+        error: null,
+        success: false,
+        busy: false,
+        accessKeyId: '',
+        secretAccessKey: '',
+        provider: 'route53'
+    };
+
     function readFileLocally(obj, file, fileName) {
         return function (event) {
             $scope.$apply(function () {
@@ -132,7 +141,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         Client.setCertificate($scope.defaultCert.certificateFile, $scope.defaultCert.keyFile, function (error) {
             if (error) {
                 $scope.defaultCert.error = error.message;
-                console.error(error);
             } else {
                 $scope.defaultCert.success = true;
                 $scope.defaultCert.certificateFileName = '';
@@ -151,7 +159,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         Client.setAdminCertificate($scope.adminCert.certificateFile, $scope.adminCert.keyFile, function (error) {
             if (error) {
                 $scope.adminCert.error = error.message;
-                console.error(error);
             } else {
                 $scope.adminCert.success = true;
                 $scope.adminCert.certificateFileName = '';
@@ -162,6 +169,30 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         });
     };
 
+    $scope.setDnsCredentials = function () {
+        $scope.dnsCredentials.busy = true;
+        $scope.dnsCredentials.error = null;
+        $scope.dnsCredentials.success = false;
+
+        var data = {
+            provider: $scope.dnsCredentials.provider,
+            accessKeyId: $scope.dnsCredentials.accessKeyId,
+            secretAccessKey: $scope.dnsCredentials.secretAccessKey
+        };
+
+        Client.setDnsConfig(data, function (error) {
+            if (error) {
+                $scope.dnsCredentials.error = error.message;
+            } else {
+                $scope.dnsCredentials.success = true;
+                $scope.dnsCredentials.accessKeyId = '';
+                $scope.dnsCredentials.secretAccessKey = '';
+            }
+
+            $scope.dnsCredentials.busy = false;
+        });
+    };
+
     $scope.setPreviewAvatar = function (avatar) {
         $scope.avatarChange.avatar = avatar;
     };