diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index e24bfac..c9fa16a 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -76,7 +76,7 @@
         form.content, context.loginAccount.get, form.message.getOrElse(""))
     updateLastActivityDate(repository.owner, repository.name)
 
-    redirect("%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
+    redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
   })
   
   get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
@@ -88,7 +88,7 @@
         form.content, context.loginAccount.get, form.message.getOrElse(""))
     updateLastActivityDate(repository.owner, repository.name)
 
-    redirect("%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
+    redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
   })
   
   get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
@@ -97,7 +97,7 @@
     deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, "Delete %s".format(pageName))
     updateLastActivityDate(repository.owner, repository.name)
 
-    redirect("%s/%s/wiki".format(repository.owner, repository.name))
+    redirect("/%s/%s/wiki".format(repository.owner, repository.name))
   })
   
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
diff --git a/src/main/scala/servlet/BasicAuthenticationFilter.scala b/src/main/scala/servlet/BasicAuthenticationFilter.scala
index d849845..dac50f1 100644
--- a/src/main/scala/servlet/BasicAuthenticationFilter.scala
+++ b/src/main/scala/servlet/BasicAuthenticationFilter.scala
@@ -22,7 +22,7 @@
     val response = res.asInstanceOf[HttpServletResponse]
 
     try {
-      val paths = request.getRequestURI.split("/")
+      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
       val repositoryOwner = paths(2)
       val repositoryName  = paths(3).replaceFirst("\\.git$", "")