diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
index 0f9df551836..3932097c233 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
@@ -269,7 +269,9 @@ class NodeGroupUnserialisationImpl(
                         tryo(s.text.toBoolean)
                       ) ?~! ("Missing attribute 'isSystem' in entry type nodeGroup : " + entry)
       properties   <- traverse((group \ "properties" \ "property").toList) {
+                        // format: off
                         case <property>{p @ _*}</property> =>
+                        // format: on
                           val name = (p \\ "name").text.trim
                           if (name.trim.isEmpty) {
                             Failure(s"Found unexpected xml under <properties> tag (name is blank): ${p}")
@@ -286,7 +288,7 @@ class NodeGroupUnserialisationImpl(
                               )
                               .toBox
                           }
-                        case xml                       => Failure(s"Found unexpected xml under <properties> tag: ${xml}")
+                        case xml                           => Failure(s"Found unexpected xml under <properties> tag: ${xml}")
                       }
     } yield {
       NodeGroup(
@@ -847,14 +849,16 @@ class ApiAccountUnserialisationImpl extends ApiAccountUnserialisation {
                             // because the event was saved < Rudder 4.3. Use a "nil" ACL
                             Full(ApiAuthorization.None)
 
-                          case Some(Text(ApiAuthorizationKind.RO.name))  =>
+                          case Some(Text(ApiAuthorizationKind.RO.name))      =>
                             Full(ApiAuthorization.RO)
-                          case Some(Text(ApiAuthorizationKind.RW.name))  =>
+                          case Some(Text(ApiAuthorizationKind.RW.name))      =>
                             Full(ApiAuthorization.RW)
+                          // format: off
                           case Some(<acl>{xml @ _*}</acl>) if (xml.nonEmpty) =>
+                          // format: on
                             unserAcl(xml.head)
                           // all other case: serialization pb => None
-                          case _                                         => Full(ApiAuthorization.None)
+                          case _                                             => Full(ApiAuthorization.None)
                         }
       accountType     = (apiAccount \ "kind").headOption.map(_.text) match {
                           case None    => ApiAccountType.PublicApi