diff --git a/src/views/support.html b/src/views/support.html
index bfbf8c040..8cfac8546 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -66,11 +66,11 @@
       </div>
   </div>
 
-  <div class="text-left" ng-show="config.provider !== 'caas'">
+  <div class="text-left" ng-show="!config.managed">
     <h3>Remote Support</h3>
   </div>
 
-  <div class="card" ng-show="config.provider !== 'caas'">
+  <div class="card" ng-show="!config.managed">
       <div class="grid-item-top">
           <div class="row animateMeOpacity">
               <div class="col-lg-12">
diff --git a/src/views/support.js b/src/views/support.js
index 91e682b74..6c795861a 100644
--- a/src/views/support.js
+++ b/src/views/support.js
@@ -64,6 +64,8 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat
     };
 
     Client.onReady(function () {
+        if ($scope.config.managed) return;
+
         Client.getAuthorizedKeys(function (error, keys) {
             if (error) return console.error(error);