diff --git a/server/build.sbt b/server/build.sbt
index 0c036c3..3a14a22 100644
--- a/server/build.sbt
+++ b/server/build.sbt
@@ -10,6 +10,8 @@
 
 scalaVersion := "2.9.1"
 
+scalazVersion := "6.0.3"
+
 seq(webSettings :_*)
 
 ivyXML :=
@@ -36,6 +38,7 @@
     "net.liftweb" %% "lift-common" % liftVersion % "compile->default",
     "net.liftweb" %% "lift-ldap" % liftVersion % "compile->default",
     "net.liftweb" %% "lift-textile" % liftVersion % "compile->default",
+    "org.scalaz" %% "scalaz-core" % "6.0.3" % "compile->default",
     "javax.servlet" % "servlet-api" % "2.5" % "provided->default",
     "org.compass-project" % "compass" % compassVersion % "compile->default",
     "org.apache.lucene" % "lucene-core" % luceneVersion % "compile->default",
diff --git a/server/pom.xml b/server/pom.xml
index 4773409..ba55d2a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -75,6 +75,7 @@
     <properties>
         <lift.version>2.4-M4</lift.version>
         <scala.version>2.9.1</scala.version>
+        <scalaz.version>6.0.3</scalaz.version>
         <compass.version>2.1.1</compass.version>
         <lucene.version>2.4.0</lucene.version>
         <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
@@ -208,6 +209,11 @@
            <version>${lift.version}</version>
         </dependency>
         <dependency>
+          <groupId>org.scalaz</groupId>
+          <artifactId>scalaz-core_${scala.version}</artifactId>
+          <version>${scalaz.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.compass-project</groupId>
             <artifactId>compass</artifactId>
             <version>${compass.version}</version>
diff --git a/server/src/main/scala/org/apache/esme/model/UserAuth.scala b/server/src/main/scala/org/apache/esme/model/UserAuth.scala
index cc9a320..643c40a 100644
--- a/server/src/main/scala/org/apache/esme/model/UserAuth.scala
+++ b/server/src/main/scala/org/apache/esme/model/UserAuth.scala
@@ -49,6 +49,9 @@
 
 import scala.xml._
 
+import scalaz._
+import Scalaz._
+
 import org.apache.esme.actor._
 
 import org.openid4java.discovery.Identifier
@@ -375,10 +378,7 @@
 
   def moduleName: String = "cm"
 
-  val cmaPath = Props.get("cma.path") match {
-    case Full(s) => s.split('/').toList
-    case _ => List("cm", "login")
-  }
+  val cmaPath = Props.get("cma.path").toOption.cata(_.split('/').toList, List("cm", "login"))
 
   def performInit(): Unit = {