diff --git a/src/app/controllers/loginCtrl.js b/src/app/controllers/loginCtrl.js
index e6b0f99f867..4feb2125404 100644
--- a/src/app/controllers/loginCtrl.js
+++ b/src/app/controllers/loginCtrl.js
@@ -7,8 +7,7 @@ function (angular, config) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('LoginCtrl', function($scope, backendSrv, $location, $routeParams) {
-
+  module.controller('LoginCtrl', function($scope, backendSrv) {
     $scope.formModel = {
       user: '',
       email: '',
@@ -19,6 +18,7 @@ function (angular, config) {
 
     $scope.googleAuthEnabled = config.googleAuthEnabled;
     $scope.githubAuthEnabled = config.githubAuthEnabled;
+    $scope.disableUserSignUp = config.disableUserSignUp;
 
     $scope.loginMode = true;
     $scope.submitBtnClass = 'btn-inverse';
@@ -26,10 +26,6 @@ function (angular, config) {
     $scope.strengthClass = '';
 
     $scope.init = function() {
-      if ($routeParams.logout) {
-        $scope.logout();
-      }
-
       $scope.$watch("loginMode", $scope.loginModeChanged);
       $scope.passwordChanged();
     };
@@ -84,13 +80,6 @@ function (angular, config) {
       });
     };
 
-    $scope.logout = function() {
-      backendSrv.post('/logout').then(function() {
-        $scope.appEvent('logged-out');
-        $location.search({});
-      });
-    };
-
     $scope.login = function() {
       delete $scope.loginError;
 
diff --git a/src/app/partials/login.html b/src/app/partials/login.html
index e57cb2531af..6a9468727c2 100644
--- a/src/app/partials/login.html
+++ b/src/app/partials/login.html
@@ -11,7 +11,7 @@
 				<button class="btn-login-tab" ng-click="loginMode = true;" ng-class="{active: loginMode}">
 					Log in
 				</button>
-				<button class="btn-login-tab" ng-click="loginMode = false;" ng-class="{active: !loginMode}">
+				<button class="btn-login-tab" ng-click="loginMode = false;" ng-class="{active: !loginMode}" ng-if="!disableUserSignUp">
 					Sign up
 				</button>
 			</div>
diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html
index 692518ddf4d..786f5b1ddb4 100644
--- a/src/app/partials/sidemenu.html
+++ b/src/app/partials/sidemenu.html
@@ -8,7 +8,7 @@
 				<span class="gravatar-email small">{{grafana.user.login}}</span>
 			</a>
 			<ul class="dropdown-menu">
-				<li><a href="{{appSubUrl}}/login?logout">Logout</a></li>
+				<li><a href="{{appSubUrl}}/logout" target="_self">Logout</a></li>
 			</ul>
 		</li>
 		<li ng-if="!grafana.user.isSignedIn">