=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-02-17 15:48:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-02-17 16:17:14 +0000
@@ -77,12 +77,7 @@
 				##data element name
 				<td class='text-column'>
 					<span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">
-						#if( $!programStageDataElement.dataElement.formName )
-							$encoder.htmlEncode( $programStageDataElement.dataElement.formName ) 
-						#else
-							$encoder.htmlEncode( $programStageDataElement.dataElement.name ) 
-						#end
-						
+						$encoder.htmlEncode( $programStageDataElement.dataElement.formNameFallback )						
 						#if ( $programStageDataElement.compulsory )
 							<em title="$i18n.getString( "required" )" class="required">*</em>
 						#end