diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go
index 52a9433de..493f6d931 100644
--- a/modules/avatar/avatar.go
+++ b/modules/avatar/avatar.go
@@ -45,7 +45,7 @@ func UpdateGravatarSource() {
 	gravatarSource = setting.GravatarSource
 	if strings.HasPrefix(gravatarSource, "//") {
 		gravatarSource = "http:" + gravatarSource
-	} else if !strings.HasPrefix(gravatarSource, "http://") ||
+	} else if !strings.HasPrefix(gravatarSource, "http://") &&
 		!strings.HasPrefix(gravatarSource, "https://") {
 		gravatarSource = "http://" + gravatarSource
 	}
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index f60746003..68d74e876 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -119,7 +119,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 func ApiReqToken() macaron.Handler {
 	return func(ctx *Context) {
 		if !ctx.IsSigned {
-			ctx.Error(403)
+			ctx.Error(401)
 			return
 		}
 	}
@@ -128,7 +128,7 @@ func ApiReqToken() macaron.Handler {
 func ApiReqBasicAuth() macaron.Handler {
 	return func(ctx *Context) {
 		if !ctx.IsBasicAuth {
-			ctx.Error(403)
+			ctx.Error(401)
 			return
 		}
 	}