diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala
index 7d4b2a9..f920688 100644
--- a/src/main/scala/app/SignInController.scala
+++ b/src/main/scala/app/SignInController.scala
@@ -3,6 +3,7 @@
 import service._
 import jp.sf.amateras.scalatra.forms._
 import util.Implicits._
+import util.StringUtil._
 import util.Keys
 
 class SignInController extends SignInControllerBase with SystemSettingsService with AccountService
@@ -47,7 +48,7 @@
       if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
         redirect("/")
       } else {
-        redirect(redirectUrl)
+        redirect(urlEncode(redirectUrl).replaceAll("%2F", "/"))
       }
     }.getOrElse {
       redirect("/")