diff --git a/modules/context/auth.go b/modules/context/auth.go
index 2624dabbd..7a1c405f8 100755
--- a/modules/context/auth.go
+++ b/modules/context/auth.go
@@ -81,8 +81,13 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 
 		// Redirect to dashboard if user tries to visit any non-login page.
 		if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" {
-			log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY")
-			ctx.Redirect(setting.AppSubURL + "/")
+			redirectTo := ctx.Query("redirect_to")
+			log.Info("redirect_to=" + redirectTo)
+			if len(redirectTo) > 0 {
+				ctx.Redirect(redirectTo)
+			} else {
+				ctx.Redirect(setting.AppSubURL + "/")
+			}
 			return
 		}
 
diff --git a/modules/context/context.go b/modules/context/context.go
index 779b2c531..8c7808466 100755
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -308,7 +308,6 @@ func Contexter() macaron.Handler {
 
 		if ctx.User != nil {
 			ctx.IsSigned = true
-			log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 			ctx.Data["IsSigned"] = ctx.IsSigned
 			ctx.Data["SignedUser"] = ctx.User
 			ctx.Data["SignedUserID"] = ctx.User.ID