diff --git a/ch2-working-with-actors/Akka/src/main/scala/akkaguide/BookmarkServlet.scala b/ch2-working-with-actors/Akka/src/main/scala/akkaguide/BookmarkServlet.scala
index f9da46a..9f2ce55 100644
--- a/ch2-working-with-actors/Akka/src/main/scala/akkaguide/BookmarkServlet.scala
+++ b/ch2-working-with-actors/Akka/src/main/scala/akkaguide/BookmarkServlet.scala
@@ -27,7 +27,7 @@ class BookmarkServlet(system: ActorSystem, bookmarkStore: ActorRef) extends Http
     val uuidFuture = bookmarkStore ? AddBookmark(title, url)
     uuidFuture.mapTo[Option[UUID]].onComplete {
       case Success(uuid) ⇒
-        writer.write("Successfully created bookmark.")
+        writer.write(s"Successfully created bookmark with uuid=$uuid")
       case Failure(error) ⇒
         writer.write("Failure creating bookmark: " + error.getMessage)
     }
@@ -40,7 +40,7 @@ class BookmarkServlet(system: ActorSystem, bookmarkStore: ActorRef) extends Http
 
     val asyncCtx = req.startAsync()
     val writer = asyncCtx.getResponse.getWriter
-    val bookmarkId = UUID.fromString(req.getParameter("id"))
+    val bookmarkId = UUID.fromString(req.getParameter("uuid"))
 
     implicit val timeout = Timeout(5 seconds)
     asyncCtx.setTimeout(5 * 1000)
diff --git a/ch2-working-with-actors/Akka/src/main/scala/akkaguide/bookmarkStore.scala b/ch2-working-with-actors/Akka/src/main/scala/akkaguide/bookmarkStore.scala
index 048efe3..253b325 100644
--- a/ch2-working-with-actors/Akka/src/main/scala/akkaguide/bookmarkStore.scala
+++ b/ch2-working-with-actors/Akka/src/main/scala/akkaguide/bookmarkStore.scala
@@ -16,8 +16,9 @@ class BookmarkStore(database: Database[Bookmark, UUID]) extends Actor {
       database.find(bookmark) match {
         case Some(found) ⇒ sender ! None
         case None ⇒
-          database.create(UUID.randomUUID, bookmark)
-          sender ! Some(bookmark)
+          val uuid = UUID.randomUUID
+          database.create(uuid, bookmark)
+          sender ! Some(uuid)
       }
     case GetBookmark(uuid) ⇒
       sender ! database.read(uuid)