diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js
index 0f671446da6..d503cecab42 100644
--- a/src/app/controllers/sidemenuCtrl.js
+++ b/src/app/controllers/sidemenuCtrl.js
@@ -23,13 +23,12 @@ function (angular, _, $, config) {
       //startsWith: config.appSubUrl + '/dashboard/',
     });
 
-    $scope.menu.push({
-      text: "Data Sources",
-      icon: "fa fa-database",
-      href: $scope.getUrl("/account/datasources"),
-    });
-
     if ($scope.grafana.user.accountRole === 'Admin') {
+      $scope.menu.push({
+        text: "Data Sources",
+        icon: "fa fa-database",
+        href: $scope.getUrl("/account/datasources"),
+      });
       $scope.menu.push({
         text: "Account", href: $scope.getUrl("/account"),
         requireRole: "Admin",
diff --git a/src/app/partials/login.html b/src/app/partials/login.html
index 55c1787ae01..6994cd87e82 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}" ng-if="!disableUserSignUp">
+				<button class="btn-login-tab" ng-click="loginMode = false;" ng-class="{active: !loginMode}" ng-show="!disableUserSignUp">
 					Sign up
 				</button>
 			</div>