diff --git a/webadmin/src/views/domains.html b/webadmin/src/views/domains.html
index af956ca35..ba77c7f7f 100644
--- a/webadmin/src/views/domains.html
+++ b/webadmin/src/views/domains.html
@@ -184,8 +184,8 @@
                   {{ domain.config.provider }}
                 </td>
                 <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" title="Edit Domain"><i class="fa fa-pencil"></i></button>
-                  <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" title="Remove Domain"><i class="fa fa-trash-o"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.config.provider !== 'caas'" title="Edit Domain"><i class="fa fa-pencil"></i></button>
+                  <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.config.provider !== 'caas'" title="Remove Domain"><i class="fa fa-trash-o"></i></button>
                 </td>
               </tr>
             </tbody>
diff --git a/webadmin/src/views/domains.js b/webadmin/src/views/domains.js
index 70a30e2a8..6cafbde4b 100644
--- a/webadmin/src/views/domains.js
+++ b/webadmin/src/views/domains.js
@@ -80,7 +80,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                 $scope.domainConfigure.cloudflareToken = domain.config.provider === 'cloudflare' ? domain.config.token : '';
                 $scope.domainConfigure.cloudflareEmail = domain.config.email;
 
-                $scope.domainConfigure.provider = domain.config.provider === 'caas' ? 'route53' : domain.config.provider;
+                $scope.domainConfigure.provider = domain.config.provider;
                 $scope.domainConfigure.provider = ($scope.domainConfigure.provider === 'manual' && domain.config.wildcard) ? 'wildcard' : domain.config.provider;
             } else {
                 $scope.domainConfigure.adding = true;