diff --git a/src/common/dataforms.py b/src/common/dataforms.py
index 2d5c3fb8626e4c595d6caee9ff8b6d10ac5bee94..6aa71d43166e152bffc8891baf5d584475119cc9 100644
--- a/src/common/dataforms.py
+++ b/src/common/dataforms.py
@@ -247,7 +247,10 @@ class ListField(DataField):
 		for element in self.iterTags('option'):
 			v = element.getTagData('value')
 			if v is None: raise WrongFieldValue
-			yield (v, element.getAttr('label'))
+			l = element.getAttr('label')
+			if not l:
+				l = v
+			yield (v, l)
 
 class ListSingleField(ListField, StringField):
 	'''Covers list-single and jid-single fields.'''