diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
index 521a10a..4dc1dc0 100644
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -512,10 +512,10 @@
 
   private def mergeOptions = new ValueType[Seq[String]] {
     override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
-      params.get("mergeOptions").getOrElse(Nil)
+      params.getOrElse("mergeOptions", Nil)
     }
     override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = {
-      val mergeOptions = params.get("mergeOptions").getOrElse(Nil)
+      val mergeOptions = params.getOrElse("mergeOptions", Nil)
       if (mergeOptions.isEmpty) {
         Seq("mergeOptions" -> "At least one option must be enabled.")
       } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {
diff --git a/src/main/scala/gitbucket/core/util/SyntaxSugars.scala b/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
index 2ede323..cc3ad41 100644
--- a/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
+++ b/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
@@ -65,7 +65,7 @@
   implicit class HeadValueAccessibleMap(map: Map[String, Seq[String]]) {
     def value(key: String): String = map(key).head
     def optionValue(key: String): Option[String] = map.get(key).flatMap(_.headOption)
-    def values(key: String): Seq[String] = map.get(key).getOrElse(Seq.empty)
+    def values(key: String): Seq[String] = map.getOrElse(key, Seq.empty)
   }
 
 }