diff --git a/routers/user/auth.go b/routers/user/auth.go
index 421598347..fe49b7b12 100755
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -535,7 +535,10 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR
 		log.Error("Unable to store session: %v", err)
 	}
 
-	// Language setting of the user overwrites the one previously set
+	// Language setting of the user use the one previously set
+	if len(ctx.GetCookie("lang")) != 0 {
+		u.Language = ctx.GetCookie("lang")
+	}
 	// If the user does not have a locale set, we save the current one.
 	if len(u.Language) == 0 {
 		u.Language = ctx.Locale.Language()