diff --git a/src/views/appstore.html b/src/views/appstore.html
index 7dd0fee8d..7e5f3cd81 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -102,9 +102,9 @@
             <p ng-show="appInstall.app.manifest.addons.email" class="text-info" ng-bind-html="'appstore.installDialog.configuredForCloudronEmail' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/' }"></p>
 
             <div class="hide">
-              <label class="control-label" for="appInstallCertificateInput" ng-show="appInstall.domain.provider !== 'caas'">Certificate (optional)</label>
-              <div class="has-error text-center" ng-show="appInstall.error.cert && appInstall.domain.provider !== 'caas'">{{ appInstall.error.cert }}</div>
-              <div class="form-group" ng-class="{ 'has-error': !appInstallForm.certificate.$dirty && appInstall.error.cert }" ng-show="appInstall.domain.provider !== 'caas'">
+              <label class="control-label" for="appInstallCertificateInput">Certificate (optional)</label>
+              <div class="has-error text-center" ng-show="appInstall.error.cert">{{ appInstall.error.cert }}</div>
+              <div class="form-group" ng-class="{ 'has-error': !appInstallForm.certificate.$dirty && appInstall.error.cert }">
                 <div class="input-group">
                   <input type="file" id="appInstallCertificateFileInput" style="display:none"/>
                   <input type="text" class="form-control" placeholder="Certificate" ng-model="appInstall.certificateFileName" id="appInstallCertificateInput" name="certificate" onclick="getElementById('appInstallCertificateFileInput').click();" style="cursor: pointer;" ng-required="appInstall.keyFileName">
@@ -113,7 +113,7 @@
                   </span>
                 </div>
               </div>
-              <div class="form-group" ng-class="{ 'has-error': !appInstallForm.key.$dirty && appInstall.error.cert }" ng-show="appInstall.domain.provider !== 'caas'">
+              <div class="form-group" ng-class="{ 'has-error': !appInstallForm.key.$dirty && appInstall.error.cert }">
                 <div class="input-group">
                   <input type="file" id="appInstallKeyFileInput" style="display:none"/>
                   <input type="text" class="form-control" placeholder="Key" ng-model="appInstall.keyFileName" id="appInstallKeyInput" name="key" onclick="getElementById('appInstallKeyFileInput').click();" style="cursor: pointer;" ng-required="appInstall.certificateFileName">
diff --git a/src/views/domains.html b/src/views/domains.html
index 5a2a22446..0df6d1402 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -238,15 +238,15 @@
           </thead>
           <tbody>
             <tr ng-repeat="domain in domains">
-              <td class="elide-table-cell hand" ng-click="domain.provider !== 'caas' && domainConfigure.show(domain)">
+              <td class="elide-table-cell hand" ng-click="domainConfigure.show(domain)">
                 {{ domain.domain }}
               </td>
-              <td class="text-left elide-table-cell hidden-xs hidden-sm hand" ng-click="domain.provider !== 'caas' && domainConfigure.show(domain)">
+              <td class="text-left elide-table-cell hidden-xs hidden-sm hand" ng-click="domainConfigure.show(domain)">
                 {{ prettyProviderName(domain) }}
               </td>
               <td class="text-right no-wrap" style="vertical-align: bottom">
-                <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas'" title="{{ 'domains.tooltipEdit' | tr }}"><i class="fa fa-pencil-alt"></i></button>
-                <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas'" title="{{ 'domains.tooltipRemove' | tr }}" ng-disabled="domain.domain === config.adminDomain"><i class="far fa-trash-alt"></i></button>
+                <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" title="{{ 'domains.tooltipEdit' | tr }}"><i class="fa fa-pencil-alt"></i></button>
+                <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" title="{{ 'domains.tooltipRemove' | tr }}" ng-disabled="domain.domain === config.adminDomain"><i class="far fa-trash-alt"></i></button>
               </td>
             </tr>
           </tbody>
diff --git a/src/views/domains.js b/src/views/domains.js
index 315c7104d..56803372f 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -47,7 +47,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
 
     $scope.prettyProviderName = function (domain) {
         switch (domain.provider) {
-        case 'caas': return 'Managed Cloudron';
         case 'route53': return 'AWS Route53';
         case 'cloudflare': return 'Cloudflare';
         case 'digitalocean': return 'DigitalOcean';
diff --git a/src/views/email.html b/src/views/email.html
index 41acd5cbf..4c55e022a 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -300,7 +300,7 @@
           <div class="row">
             <div class="col-md-10" ng-bind-html="'email.incoming.description' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/', rainloopLink: '/#/appstore/net.rainloop.cloudronapp', sogoLink: '/#/appstore/nu.sogo.cloudronapp2', roundcubeLink: '/#/appstore/net.roundcube.cloudronapp' } "></div>
             <div class="col-md-2">
-              <button class="pull-right" ng-class="domain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="domain.provider !== 'caas' && incomingEmail.toggleEmailEnabled()" ng-disabled="domain.provider === 'caas' || incomingEmail.busy">
+              <button class="pull-right" ng-class="domain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="incomingEmail.toggleEmailEnabled()" ng-disabled="incomingEmail.busy">
                 <i class="fa fa-circle-notch fa-spin" ng-show="incomingEmail.busy"></i>
                 {{ domain.mailConfig.enabled ? ('email.incoming.disableAction' | tr) : ('email.incoming.enableAction' | tr) }}
               </button>