Merge branch 'master' into webhook

src/main/scala/app/SignInController.scala

@@ -42,9 +42,13 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
     session.setAttribute("LOGIN_ACCOUNT", account)
     updateLastLoginDate(account.userName)
 
-    session.get("REDIRECT").map { redirectUrl =>
+    session.get("REDIRECT").map { case redirectUrl: String =>
       session.removeAttribute("REDIRECT")
-      redirect(redirectUrl.asInstanceOf[String])
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
     }.getOrElse {
       redirect("/")
     }