diff --git a/src/js/client.js b/src/js/client.js
index 17958adce..c7eb826ea 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -359,7 +359,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         // this._config.features.externalLdap = false;
         // this._config.features.eventLog = false;
         // this._config.features.privateDockerRegistry = false;
-        // this._config.features.branding = false;
+        // this._config.features.support = true;
 
         this._configListener.forEach(function (callback) {
             callback(that._config);
diff --git a/src/views/support.html b/src/views/support.html
index 44ea61fd9..e005fd4dc 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -10,11 +10,11 @@
 
   <div class="card">
     <div class="grid-item-top">
-      <div class="row animateMeOpacity" ng-show="subscription.plan.id === 'free'">
-        <p class="text-bold">This feature is only available in the paid plans.</p>
+      <div class="row" ng-hide="config.features.support">
+        <p class="text-bold">Support tickets are only available in the paid plans.</p>
         <p>You may find answers in our <a href="https://cloudron.io/documentation/apps/?support_view" target="_blank">documentation</a> or ask on the <a href="https://forum.cloudron.io/" target="_blank">Forum</a>.</p>
       </div>
-      <div class="row animateMeOpacity" ng-hide="subscription.plan.id === 'free'">
+      <div class="row" ng-show="config.features.support">
         <div class="col-lg-12">
           <div ng-bind-html="supportConfig.ticketFormBody | markdown2html"></div>
           <form ng-show="supportConfig.submitTickets" name="feedbackForm" ng-submit="submitFeedback()">
@@ -59,18 +59,16 @@
 
   <div class="card">
     <div class="grid-item-top">
-      <div class="row animateMeOpacity" ng-show="subscription.plan.id === 'free'">
-        <b>This feature is only available in the paid plans.</b>
-      </div>
-      <div class="row animateMeOpacity" ng-hide="subscription.plan.id === 'free'">
+      <div class="row">
         <div class="col-lg-12">
-          Enable this option to allow support engineers to connect to this server via SSH.
-          <br/>
-          <br/>
-          <b>Do not enable this option unless requested by the Cloudron support team.</b>
-          <br/>
-          <br/>
-          <button class="btn" ng-class="!sshSupportEnabled ? 'btn-danger pull-right' : 'btn-primary pull-right'" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? 'Disable SSH support access' : 'Enable SSH support access' }}</button>
+          <p ng-hide="config.features.support" class="text-bold">Remote support is only available in the paid plans.</p>
+          <p>Enable this option to allow support engineers to connect to this server via SSH.</p>
+          <div ng-show="config.features.support">
+            <b>Do not enable this option unless requested by the Cloudron support team.</b>
+            <br/>
+            <br/>
+            <button class="btn" ng-class="!sshSupportEnabled ? 'btn-danger pull-right' : 'btn-primary pull-right'" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? 'Disable SSH support access' : 'Enable SSH support access' }}</button>
+          </div>
         </div>
       </div>
     </div>