diff --git a/project/build.scala b/project/build.scala
index a311c75..3fe6111 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -49,7 +49,7 @@
       "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
       "org.scalatra" %% "scalatra-json" % ScalatraVersion,
       "org.json4s" %% "json4s-jackson" % "3.2.11",
-      "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
+      "jp.sf.amateras" %% "scalatra-forms" % "0.2.0",
       "commons-io" % "commons-io" % "2.4",
       "io.github.gitbucket" % "markedj" % "1.0.5-SNAPSHOT",
       "org.apache.commons" % "commons-compress" % "1.9",
diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
index 1463a9a..883259b 100644
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -300,9 +300,8 @@
 
   private def webhookEvents = new ValueType[Set[WebHook.Event]]{
     def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
-      val map = params.toSeq.toMap // TODO This transformation will be unnecessary after upgrading to scalatra 2.4 and scalatra-forms 0.2
       WebHook.Event.values.flatMap { t =>
-        map.get(name + "." + t.name).map(_ => t)
+        params.get(name + "." + t.name).map(_ => t)
       }.toSet
     }
     def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){