diff --git a/plugins/Bookmark/bookmarkform.php b/plugins/Bookmark/bookmarkform.php
index 5f355cdb2f117fc335e0edcc5410a5426ee6694c..802bbe6c9c97567f9d531191931109236e01e025 100644
--- a/plugins/Bookmark/bookmarkform.php
+++ b/plugins/Bookmark/bookmarkform.php
@@ -120,6 +120,7 @@ class BookmarkForm extends Form
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','URL'),
                           $this->_url,
+                          null,
                           'url');
         $this->unli();
 
@@ -138,6 +139,7 @@ class BookmarkForm extends Form
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','Title'),
                           $this->_title,
+                          null,
                           'title');
         $this->unli();
 
@@ -146,6 +148,7 @@ class BookmarkForm extends Form
                              // TRANS: Field label on form for adding a new bookmark.
                              _m('LABEL','Notes'),
                              $this->_description,
+                             null,
                              'description');
         $this->unli();
 
diff --git a/plugins/Bookmark/bookmarkforurl.php b/plugins/Bookmark/bookmarkforurl.php
index 0c7a94b93731cbacc1e723ccaa2fb464c5de25c8..d3a1a2c76f2bc5e2afc7bc36ae8d137f63194c5c 100644
--- a/plugins/Bookmark/bookmarkforurl.php
+++ b/plugins/Bookmark/bookmarkforurl.php
@@ -67,8 +67,7 @@ class BookmarkforurlAction extends Action
         }
 
         $this->checkSessionToken();
-
-        $this->url = $this->trimmed('initial-bookmark-url');
+        $this->url = $this->trimmed('url');
 
         if (empty($this->url)) {
             throw new ClientException(_('URL is required.'), 400);
diff --git a/plugins/Bookmark/initialbookmarkform.php b/plugins/Bookmark/initialbookmarkform.php
index c49bd67432a0faf8af2a9b11382822356d6af8dc..70a265778349784489adce5041f3e3ce9e931220 100644
--- a/plugins/Bookmark/initialbookmarkform.php
+++ b/plugins/Bookmark/initialbookmarkform.php
@@ -75,7 +75,10 @@ class InitialBookmarkForm extends Form
         $this->li();
         $this->out->input('initial-bookmark-url',
                           // TRANS: Field label on form for adding a new bookmark.
-                          _m('LABEL','URL'));
+                          _m('LABEL','URL'),
+                          null,
+                          null,
+                          'url');
         $this->unli();
 
         $this->out->elementEnd('ul');
diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index 8c60fc159681b9da422343aacc71e166956d62fd..92e9bc81c59a3ee77106f7a1383fb11969e378f9 100644
--- a/plugins/Bookmark/newbookmark.php
+++ b/plugins/Bookmark/newbookmark.php
@@ -87,10 +87,10 @@ class NewbookmarkAction extends Action
             $this->checkSessionToken();
         }
 
-        $this->title       = $this->trimmed('bookmark-title');
-        $this->url         = $this->trimmed('bookmark-url');
-        $this->tags        = $this->trimmed('bookmark-tags');
-        $this->description = $this->trimmed('bookmark-description');
+        $this->title       = $this->trimmed('title');
+        $this->url         = $this->trimmed('url');
+        $this->tags        = $this->trimmed('tags');
+        $this->description = $this->trimmed('description');
 
         return true;
     }