diff --git a/lib/util.php b/lib/util.php
index 07332a07f3..0b69b9d860 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -217,8 +217,11 @@ function common_password($id, $label) {
 }
 
 function common_submit($id, $label) {
+	global $xw;
 	common_element_start('p');
-	common_element('label', NULL, ' ');
+	common_element_start('label', array('for' => $id));
+	$xw->writeRaw(' ');
+	common_element_end('label');
 	common_element('input', array('type' => 'submit',
 								  'id' => $id,
 								  'name' => $id,