diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 3608a56f99b..b63e587c00e 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -39,25 +39,27 @@
 				</div>
 			</form>
 
-			<div class="text-center login-divider" ng-if="oauthEnabled">
-				<div class="login-divider-line">
-					<span class="login-divider-text">
-						Or login with
-					</span>
+			<div ng-if="loginMode">
+				<div class="text-center login-divider" ng-if="oauthEnabled">
+					<div class="login-divider-line">
+						<span class="login-divider-text">
+							Or login with
+						</span>
+					</div>
 				</div>
-			</div>
 
-			<div class="clearfix"></div>
+				<div class="clearfix"></div>
 
-			<div class="login-oauth text-center" ng-if="oauthEnabled">
-				<a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="googleAuthEnabled">
-					<i class="fa fa-google"></i>
-					with Google
-				</a>
-				<a class="btn btn-large btn-github" href="login/github" target="_self" ng-if="githubAuthEnabled">
-					<i class="fa fa-github"></i>
-					with Github
-				</a>
+				<div class="login-oauth text-center" ng-if="oauthEnabled">
+					<a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="googleAuthEnabled">
+						<i class="fa fa-google"></i>
+						with Google
+					</a>
+					<a class="btn btn-large btn-github" href="login/github" target="_self" ng-if="githubAuthEnabled">
+						<i class="fa fa-github"></i>
+						with Github
+					</a>
+				</div>
 			</div>
 
 			<div class="clearfix"></div>
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index c57e5fcfd26..c5074b275fd 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -64,7 +64,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
   this.annotationQuery = function(options) {
     // Graphite metric as annotation
     if (options.annotation.target) {
-      var target = templateSrv.replace(options.annotation.target);
+      var target = templateSrv.replace(options.annotation.target, {}, 'glob');
       var graphiteQuery = {
         rangeRaw: options.rangeRaw,
         targets: [{ target: target }],
@@ -72,8 +72,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
         maxDataPoints: 100
       };
 
-      return this.query(graphiteQuery)
-      .then(function(result) {
+      return this.query(graphiteQuery).then(function(result) {
         var list = [];
 
         for (var i = 0; i < result.data.length; i++) {
diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss
index 4a94c8021bc..926e8c21f6c 100644
--- a/public/sass/pages/_login.scss
+++ b/public/sass/pages/_login.scss
@@ -55,6 +55,10 @@
     color: $white;
   }
 
+  &:focus {
+    outline: 0;
+  }
+
   font-weight: bold;
   display: inline-block;
   width: 170px;
@@ -178,7 +182,7 @@
 }
 
 @include media-breakpoint-up(md) {
-  .login-box-logo {      
+  .login-box-logo {
     img {
       width: 125px;
     }