=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-10-13 10:58:53 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-10-13 11:05:24 +0000
@@ -28,7 +28,7 @@
 		#foreach( $dataElement in $dataElements)
 			#foreach( $optionCombo in $dataElement.categoryCombo.optionCombos )
 				#set( $key = "DE${dataElement.id}OC${optionCombo.id}" )
-				<label>$dataElement.name #if($dataElement.categoryCombo.optionCombos.size > 1)$optionCombo.name#end</label>
+				<label>$dataElement.name #if($optionCombo.name!="(default)")$optionCombo.name#end</label>
 
 				#if( $validationViolations.get( $key ) )
 				#set( $validationViolation = $validationViolations.get( $key ) )