diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index d9208c444..3690464e7 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -6,7 +6,7 @@
 		if ($subop == "save") {
 
 			$id = db_escape_string($_REQUEST["id"]);
-			$caption = trim(db_escape_string($_REQUEST["value"]));
+			$caption = db_escape_string(trim($_REQUEST["value"]));
 
 			db_query($link, "BEGIN");
 
@@ -32,7 +32,7 @@
 							AND action_id = 7
 							AND owner_uid = " . $_SESSION["uid"]);
 
-						print $caption;
+						print $_REQUEST["value"];
 					}
 				} else {
 					print $old_caption;
diff --git a/prefs.js b/prefs.js
index 12a95249e..846540a5c 100644
--- a/prefs.js
+++ b/prefs.js
@@ -151,7 +151,8 @@ function labellist_callback() {
 
 						var id = elems[i].id.replace("LILT-", "");
 							new Ajax.InPlaceEditor(elems[i],
-							'backend.php?op=pref-labels&subop=save&id=' + id);
+							'backend.php?op=pref-labels&subop=save&id=' + id,
+							{cols: 20, rows: 1});
 					}
 				}
 			}