diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 49ec9f54b2a..d4a0b2da2aa 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -182,6 +182,10 @@ func initContextWithBasicAuth(ctx *models.ReqContext, orgId int64) bool {
 }
 
 func initContextWithToken(authTokenService models.UserTokenService, ctx *models.ReqContext, orgID int64) bool {
+	if setting.LoginCookieName == "" {
+		return false
+	}
+
 	rawToken := ctx.GetCookie(setting.LoginCookieName)
 	if rawToken == "" {
 		return false
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 8acc0527fdb..78ff178c151 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -45,6 +45,10 @@
           </div>
         </div>
         <div class="clearfix"></div>
+        <a class="btn btn-medium btn-service btn-service--github login-btn" href="login/saml" target="_self" ng-if="samlEnabled">
+          <i class="btn-service-icon fa fa-key"></i>
+          Sign in with SAML
+        </a>
         <div class="login-oauth text-center" ng-show="oauthEnabled">
           <a class="btn btn-medium btn-service btn-service--google login-btn" href="login/google" target="_self" ng-if="oauth.google">
             <i class="btn-service-icon fa fa-google"></i>
@@ -68,10 +72,6 @@
             <i class="btn-service-icon fa fa-sign-in"></i>
             Sign in with {{oauth.generic_oauth.name}}
           </a>
-          <a class="btn btn-medium btn-service btn-service--github login-btn" href="login/saml" target="_self" ng-if="samlEnabled">
-            <i class="btn-service-icon fa fa-key"></i>
-            Sign in with SAML
-          </a>
         </div>
         <div class="login-signup-box" ng-show="!disableUserSignUp">
           <div class="login-signup-title p-r-1">