diff --git a/src/index.html b/src/index.html
index 12346c847..719f08ed3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -150,13 +150,13 @@
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="#/account"><i class="fa fa-user fa-fw"></i> Account</a></li>
                                 <li ng-show="user.admin"><a href="#/activity"><i class="fa fa-list-alt fa-fw"></i> Activity</a></li>
-                                <li ng-show="user.admin"><a href="#/addons"><i class="fa fa-puzzle-piece fa-fw"></i> Addons</a></li>
                                 <!-- <li ng-show="user.admin"><a href="#/tokens"><i class="fa fa-key fa-fw"></i> API Access</a></li> -->
                                 <li ng-show="user.admin"><a href="#/backups"><i class="fa fa-archive fa-fw"></i> Backups</a></li>
                                 <li ng-show="user.admin"><a href="#/domains"><i class="fa fa-globe fa-fw"></i> Domains & Certs</a></li>
                                 <li ng-show="user.admin"><a href="#/email"><i class="fa fa-envelope fa-fw"></i> Email</a></li>
                                 <li ng-show="user.admin"><a href="#/graphs"><i class="fa fa-chart-bar fa-fw"></i> Graphs</a></li>
                                 <li ng-show="user.admin"><a href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a></li>
+                                <li ng-show="user.admin"><a href="#/system"><i class="fa fa-cogs fa-fw"></i> System</a></li>
                                 <li ng-show="user.admin" class="divider"></li>
                                 <li ng-show="user.admin"><a href="#/support"><i class="fa fa-comment fa-fw"></i> Support</a></li>
                                 <li class="divider"></li>
diff --git a/src/js/index.js b/src/js/index.js
index 95e6c065a..c2a1097da 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -70,9 +70,6 @@ app.config(['$routeProvider', function ($routeProvider) {
     }).when('/users', {
         controller: 'UsersController',
         templateUrl: 'views/users.html?<%= revision %>'
-    }).when('/addons', {
-        controller: 'AddonsController',
-        templateUrl: 'views/addons.html?<%= revision %>'
     }).when('/appstore', {
         controller: 'AppStoreController',
         templateUrl: 'views/appstore.html?<%= revision %>'
@@ -109,6 +106,9 @@ app.config(['$routeProvider', function ($routeProvider) {
     }).when('/support', {
         controller: 'SupportController',
         templateUrl: 'views/support.html?<%= revision %>'
+    }).when('/system', {
+        controller: 'SystemController',
+        templateUrl: 'views/system.html?<%= revision %>'
     }).when('/tokens', {
         controller: 'TokensController',
         templateUrl: 'views/tokens.html?<%= revision %>'
diff --git a/src/views/addons.html b/src/views/system.html
similarity index 100%
rename from src/views/addons.html
rename to src/views/system.html
diff --git a/src/views/addons.js b/src/views/system.js
similarity index 98%
rename from src/views/addons.js
rename to src/views/system.js
index 87fd8c713..800030453 100644
--- a/src/views/addons.js
+++ b/src/views/system.js
@@ -2,7 +2,7 @@
 
 /* global angular */
 
-angular.module('Application').controller('AddonsController', ['$scope', '$location', '$interval', 'Client', function ($scope, $location, $interval, Client) {
+angular.module('Application').controller('SystemController', ['$scope', '$location', '$interval', 'Client', function ($scope, $location, $interval, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); });
 
     $scope.config = Client.getConfig();