diff --git a/lib/util.php b/lib/util.php
index c3d11b074c..03720a7789 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -401,9 +401,8 @@ function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value
 		$attrs['disabled'] = 'true';
 	}
 	common_element('input', $attrs);
-	# XXX: use a <label>
 	common_text(' ');
-	common_element('span', 'checkbox_label', $label);
+	common_element('label', array('class' => 'checkbox_label', 'for' => $id), $label);
 	common_text(' ');
 	if ($instructions) {
 		common_element('span', 'input_instructions', $instructions);
diff --git a/theme/identica/display.css b/theme/identica/display.css
index 52a63a5ae6..73acf40121 100644
--- a/theme/identica/display.css
+++ b/theme/identica/display.css
@@ -145,6 +145,12 @@ textarea:focus, input:focus {
     color: #91AA9D;
     }
 
+label.checkbox_label {
+    display: inline;
+    font-weight: normal;
+}
+
+
 #status_textarea {
     color: #193441;
 }
@@ -186,4 +192,4 @@ textarea:focus, input:focus {
 
 .message_single:hover {
     background-color: #F3F8EA;
-    }
\ No newline at end of file
+    }