diff --git a/src/app/features/admin/accountCtrl.js b/src/app/features/account/accountCtrl.js
similarity index 100%
rename from src/app/features/admin/accountCtrl.js
rename to src/app/features/account/accountCtrl.js
diff --git a/src/app/features/admin/datasourcesCtrl.js b/src/app/features/account/datasourcesCtrl.js
similarity index 83%
rename from src/app/features/admin/datasourcesCtrl.js
rename to src/app/features/account/datasourcesCtrl.js
index 5d53151a9ca..3563634fc31 100644
--- a/src/app/features/admin/datasourcesCtrl.js
+++ b/src/app/features/account/datasourcesCtrl.js
@@ -45,19 +45,19 @@ function (angular) {
     };
 
     $scope.getDatasources = function() {
-      backendSrv.get('/api/admin/datasources/list').then(function(results) {
+      backendSrv.get('/api/datasources/list').then(function(results) {
         $scope.datasources = results;
       });
     };
 
     $scope.remove = function(ds) {
-      backendSrv.delete('/api/admin/datasources/' + ds.id).then(function() {
+      backendSrv.delete('/api/datasources/' + ds.id).then(function() {
         $scope.getDatasources();
       });
     };
 
     $scope.update = function() {
-      backendSrv.post('/api/admin/datasources', $scope.current).then(function() {
+      backendSrv.post('/api/datasources', $scope.current).then(function() {
         $scope.editor.index = 0;
         $scope.getDatasources();
       });
@@ -68,7 +68,7 @@ function (angular) {
         return;
       }
 
-      backendSrv.put('/api/admin/datasources', $scope.current)
+      backendSrv.put('/api/datasources', $scope.current)
         .then(function() {
           $scope.editor.index = 0;
           $scope.getDatasources();
diff --git a/src/app/features/admin/partials/account.html b/src/app/features/account/partials/account.html
similarity index 100%
rename from src/app/features/admin/partials/account.html
rename to src/app/features/account/partials/account.html
diff --git a/src/app/features/admin/partials/datasources.html b/src/app/features/account/partials/datasources.html
similarity index 99%
rename from src/app/features/admin/partials/datasources.html
rename to src/app/features/account/partials/datasources.html
index 9d179817f4e..86264721cbe 100644
--- a/src/app/features/admin/partials/datasources.html
+++ b/src/app/features/account/partials/datasources.html
@@ -6,7 +6,7 @@
 
 			<div class="dashboard-editor-header">
 				<div class="dashboard-editor-title">
-					<i class="icon icon-sitemap"></i>
+					<i class="fa fa-sitemap"></i>
 					Data sources
 				</div>
 
diff --git a/src/app/features/admin/adminCtrl.js b/src/app/features/admin/adminCtrl.js
new file mode 100644
index 00000000000..bda82618503
--- /dev/null
+++ b/src/app/features/admin/adminCtrl.js
@@ -0,0 +1,18 @@
+define([
+  'angular',
+],
+function (angular) {
+  'use strict';
+
+  var module = angular.module('grafana.controllers');
+
+  module.controller('AdminCtrl', function($scope) {
+
+    $scope.init = function() {
+      $scope.editor = {index: 0};
+    };
+
+    $scope.init();
+
+  });
+});
diff --git a/src/app/features/admin/partials/admin.html b/src/app/features/admin/partials/admin.html
new file mode 100644
index 00000000000..637dd49f396
--- /dev/null
+++ b/src/app/features/admin/partials/admin.html
@@ -0,0 +1,23 @@
+<div ng-include="'app/partials/navbar.html'" ng-init="pageTitle='Admin'"></div>
+
+<div class="dashboard-edit-view" style="min-height: 500px">
+	<div class="editor-row">
+		<div class="section">
+
+			<div class="dashboard-editor-header">
+				<div class="dashboard-editor-title">
+					<i class="fa fa-instiution"></i>
+					System administration
+				</div>
+
+				<div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
+					<div ng-repeat="tab in ['Settings','Users', 'Log', 'Audit']" data-title="{{tab}}">
+					</div>
+				</div>
+
+			</div>
+
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/app/features/all.js b/src/app/features/all.js
index 2a22f0c5dd3..296d36f2f38 100644
--- a/src/app/features/all.js
+++ b/src/app/features/all.js
@@ -7,7 +7,8 @@ define([
   './opentsdb/datasource',
   './elasticsearch/datasource',
   './dashboard/all',
-  './admin/accountCtrl',
-  './admin/datasourcesCtrl',
+  './account/accountCtrl',
+  './account/datasourcesCtrl',
+  './admin/adminCtrl',
   './grafanaDatasource/datasource',
 ], function () {});
diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html
index 4f45264348e..dca7226323a 100644
--- a/src/app/partials/sidemenu.html
+++ b/src/app/partials/sidemenu.html
@@ -20,13 +20,16 @@
 		<i class="fa fa-bolt" style="padding-right: 23px"></i>
 		 Alerts
 	</a>
-	<a class="pro-sidemenu-link" href="admin/datasources">
+	<a class="pro-sidemenu-link" href="account/datasources">
 		<i class="fa fa-sitemap"></i>
 		Data sources
 	</a>
 	<a class="pro-sidemenu-link" href="account">
 		<i class="fa fa-user"></i>
-		Account settings
+		Account
+	</a>
+	<a class="pro-sidemenu-link" href="admin">
+		<i class="fa fa-institution"></i>Admin
 	</a>
 	<a class="pro-sidemenu-link" href="login?logout">
 		<i class="fa fa-sign-out"></i>
diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js
index a99d2b37b46..5d0e623c8e5 100644
--- a/src/app/routes/backend/all.js
+++ b/src/app/routes/backend/all.js
@@ -30,14 +30,18 @@ define([
         controller : 'DashFromImportCtrl',
         reloadOnSearch: false,
       })
-      .when('/admin/datasources', {
-        templateUrl: 'app/features/admin/partials/datasources.html',
+      .when('/account/datasources', {
+        templateUrl: 'app/features/account/partials/datasources.html',
         controller : 'DataSourcesCtrl',
       })
       .when('/account', {
-        templateUrl: 'app/features/admin/partials/account.html',
+        templateUrl: 'app/features/account/partials/account.html',
         controller : 'AccountCtrl',
       })
+      .when('/admin/', {
+        templateUrl: 'app/features/admin/partials/admin.html',
+        controller : 'AdminCtrl',
+      })
       .when('/login', {
         templateUrl: 'app/partials/login.html',
         controller : 'LoginCtrl',