diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
index f5d6726..7476b72 100644
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -224,7 +224,7 @@
   /**
    * Display the web hook edit page.
    */
-  get("/:owner/:repository/settings/hooks/edit/:url")(ownerOnly { repository =>
+  get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
     getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
       html.edithooks(webhook, events, repository, flash.get("info"), false)
     } getOrElse NotFound
@@ -233,7 +233,7 @@
   /**
    * Update web hook settings.
    */
-  post("/:owner/:repository/settings/hooks/edit/:url", webHookForm(true))(ownerOnly { (form, repository) =>
+  post("/:owner/:repository/settings/hooks/edit", webHookForm(true))(ownerOnly { (form, repository) =>
     updateWebHook(repository.owner, repository.name, form.url, form.events)
     flash += "info" -> s"webhook ${form.url} updated"
     redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
diff --git a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
index 39a8457..ec3384a 100644
--- a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html
@@ -58,7 +58,7 @@
             <label class="checkbox"><input type="checkbox" @check("events",Push) />Push <span class="help-block normal">Git push to a repository. </span> </label>
             <div class="text-right">
               @if(!create){
-                <input type="submit" class="btn btn-success" value="Update webhook" formaction="@url(repository)/settings/hooks/edit/@urlEncode(webHook.url)" />
+                <input type="submit" class="btn btn-success" value="Update webhook" formaction="@url(repository)/settings/hooks/edit" />
                 <a href="@url(repository)/settings/hooks/delete?url=@urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">
                   Delete webhook
                 </a>
diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
index 0365072..74e64d9 100644
--- a/src/main/twirl/gitbucket/core/settings/hooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
@@ -22,13 +22,13 @@
           <table class="table table-condensed" style="margin-bottom:0">
             @webHooks.map { case (webHook, events) =>
               <tr><td style="vertical-align: middle;">
-                <a href="@url(repository)/settings/hooks/edit/@urlEncode(webHook.url)" class="css-truncate" style="max-width:360px">
+                <a href="@url(repository)/settings/hooks/edit?url=@urlEncode(webHook.url)" class="css-truncate" style="max-width:360px">
                   <span class="css-truncate-target">@webHook.url</span>
                 </a>
                 <em class="css-truncate" style="max-width: 225px;">(<span class="css-truncate-target">@events.map(_.name).mkString(", ")</span>)</em>
               </td><td>
                 <div class="btn-group pull-right">
-                  <a href="@url(repository)/settings/hooks/edit/@urlEncode(webHook.url)" class="btn btn-default">
+                  <a href="@url(repository)/settings/hooks/edit?url=@urlEncode(webHook.url)" class="btn btn-default">
                     <span class="octicon octicon-pencil"></span>
                   </a>
                   <a href="@url(repository)/settings/hooks/delete?url=@urlEncode(webHook.url)" class="btn btn-danger" onclick="return confirm('delete webhook for @webHook.url ?')">