diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala
index 5e60eb4..81e1dca 100644
--- a/src/main/scala/app/ControllerBase.scala
+++ b/src/main/scala/app/ControllerBase.scala
@@ -38,12 +38,15 @@
       val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
       if(account == null){
         // Redirect to login form
+        // TODO Should use the configured base url.
         httpResponse.sendRedirect(context + "/signin?" + StringUtil.urlEncode(path))
       } else if(account.isAdmin){
         // H2 Console (administrators only)
+        // TODO Should use the configured base url.
         chain.doFilter(request, response)
       } else {
         // Redirect to dashboard
+        // TODO Should use the configured base url.
         httpResponse.sendRedirect(context + "/")
       }
     } else if(path.startsWith("/git/")){
@@ -116,15 +119,19 @@
                        includeContextPath: Boolean = true, includeServletPath: Boolean = true)
                       (implicit request: HttpServletRequest, response: HttpServletResponse) =
     if (path.startsWith("http")) path
-    else baseUrl + url(path, params, false, false)
+    else baseUrl + url(path, params, false, false, false)
 
 }
 
 /**
  * Context object for the current request.
+ *
+ * @param path the context path
  */
 case class Context(path: String, loginAccount: Option[Account], request: HttpServletRequest){
 
+  lazy val currentPath = request.getRequestURI.substring(path.length)
+
   /**
    * Get object from cache.
    *
diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html
index 7ec9842..0d73555 100644
--- a/src/main/twirl/main.scala.html
+++ b/src/main/twirl/main.scala.html
@@ -61,7 +61,7 @@
                 }
                 <a href="@path/signout" class="menu-last" data-toggle="tooltip" data-placement="bottom" title="Sign out"><i class="icon-share-alt"></i></a>
               } else {
-                <a href="@path/signin" class="btn btn-last" id="signin">Sign in</a>
+                <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn btn-last" id="signin">Sign in</a>
               }
             </div><!--/.nav-collapse -->
           </div>
@@ -76,7 +76,6 @@
         $('#search').submit(function(){
           return $.trim($(this).find('input[name=query]').val()) != '';
         });
-        $('#signin').attr('href', '@path/signin?redirect=' + encodeURIComponent(location.pathname + location.search + location.hash));
       });
     </script>
   </body>