diff --git a/src/js/client.js b/src/js/client.js
index f09727a97..504c5a895 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -218,14 +218,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             region: null,
             size: null
         };
-        this._features = {
-            userMaxCount: Infinity,
-            appMaxCount: 2, // unused checked on the appstore side, but just for completeness
-            externalLdap: true,
-            eventLog: true,
-            privateDockerRegistry: true,
-            branding: true
-        };
         this._installedApps = [];
         this._installedAppsById = {};
         this._appTags = [];
@@ -373,10 +365,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         return this._config;
     };
 
-    Client.prototype.getFeatures = function () {
-        return this._features;
-    };
-
     Client.prototype.setToken = function (accessToken) {
         if (!accessToken) localStorage.removeItem('token');
         else localStorage.token = accessToken;
diff --git a/src/views/activity.html b/src/views/activity.html
index 289395ae1..c6740d0c9 100644
--- a/src/views/activity.html
+++ b/src/views/activity.html
@@ -25,10 +25,10 @@
 <div>
   <div class="col-md-10 col-md-offset-1">
     <div class="card card-block" style="max-width: 100%">
-      <div ng-hide="features.eventLog">
+      <div ng-hide="config.features.eventLog">
         <b class="text-danger">This features is only available in the business plan.</b>
       </div>
-      <div ng-show="features.eventLog">
+      <div ng-show="config.features.eventLog">
         <center ng-show="busy"><h2><i class="fa fa-circle-notch fa-spin"></i></h2></center>
         <table ng-hide="busy" class="table table-condensed table-hover">
           <thead>
diff --git a/src/views/activity.js b/src/views/activity.js
index 105be9da4..a9b295624 100644
--- a/src/views/activity.js
+++ b/src/views/activity.js
@@ -7,7 +7,6 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
     Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); });
 
     $scope.config = Client.getConfig();
-    $scope.features = Client.getFeatures();
 
     $scope.busy = false;
     $scope.eventLogs = [];
diff --git a/src/views/settings.html b/src/views/settings.html
index d23bfc24e..d62e6de6e 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -354,13 +354,13 @@
 
     <br/>
 
-    <div class="row" ng-hide="features.privateDockerRegistry">
+    <div class="row" ng-hide="config.features.privateDockerRegistry">
       <div class="col-xs-12">
         <b class="text-danger">This features is only available in the business plan.</b>
       </div>
     </div>
 
-    <div class="row" ng-show="features.privateDockerRegistry">
+    <div class="row" ng-show="config.features.privateDockerRegistry">
       <div class="col-xs-6">
         <span class="text-muted">Server address</span>
       </div>
@@ -369,7 +369,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="features.privateDockerRegistry">
+    <div class="row" ng-show="config.features.privateDockerRegistry">
       <div class="col-xs-6">
         <span class="text-muted">Username</span>
       </div>
@@ -380,7 +380,7 @@
 
     <br/>
 
-    <div class="row" ng-show="features.privateDockerRegistry">
+    <div class="row" ng-show="config.features.privateDockerRegistry">
       <div class="col-xs-12">
         <button class="btn btn-primary pull-right" ng-click="registryConfig.show()">Configure Registry</button>
       </div>
diff --git a/src/views/settings.js b/src/views/settings.js
index bddb3e130..378fca6d7 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -9,7 +9,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     $scope.client = Client;
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
-    $scope.features = Client.getFeatures();
     $scope.installedApps = Client.getInstalledApps();
 
     $scope.subscription = null;
diff --git a/src/views/users.html b/src/views/users.html
index 871dc4c0a..1f0d88b55 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -352,7 +352,7 @@
     <h1>Users
         <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#users" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
 
-        <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()" ng-disabled="features.userMaxCount <= allUsers.length" uib-tooltip="{{ features.userMaxCount <= allUsers.length ? 'Subscription required': '' }}" tooltip-class="long nowrap" tooltip-placement="left">
+        <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()" ng-disabled="config.features.userMaxCount <= allUsers.length" uib-tooltip="{{ config.features.userMaxCount <= allUsers.length ? 'Subscription required': '' }}" tooltip-class="long nowrap" tooltip-placement="left">
           <i class="fa fa-user-plus"></i> New User
         </button>
     </h1>
@@ -485,11 +485,11 @@
     </div>
     <br/>
 
-    <div ng-hide="features.externalLdap">
+    <div ng-hide="config.features.externalLdap">
       <b class="text-danger">This features is only available in the business plan.</b>
     </div>
 
-    <div ng-show="features.externalLdap">
+    <div ng-show="config.features.externalLdap">
       <div class="row">
         <div class="col-xs-6">
           <span class="text-muted">Provider</span>
diff --git a/src/views/users.js b/src/views/users.js
index eb1ac9963..c5bf7d915 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -24,7 +24,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.groupsById = { };
     $scope.config = Client.getConfig();
     $scope.userInfo = Client.getUserInfo();
-    $scope.features = Client.getFeatures();
 
     $scope.allUsers = [];