=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetOrganisationUnitsAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetOrganisationUnitsAction.java	2011-10-24 11:36:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetOrganisationUnitsAction.java	2011-10-24 12:18:38 +0000
@@ -92,7 +92,6 @@
         {
             organisationUnits = new ArrayList<OrganisationUnit>( user.getOrganisationUnits() );
             Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
-            organisationUnits = sectionFormUtils.organisationUnitWithDataSetsFilter( organisationUnits );
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm	2011-10-24 11:36:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm	2011-10-24 12:18:38 +0000
@@ -4,10 +4,21 @@
 <p>
 <ul>
 #foreach( $organisationUnit in $organisationUnits )
-	<li><a href="selectDataSet.action?organisationUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
-	#if( $organisationUnit.children.size() > 0 )
-		#foreach( $child in $sectionFormUtils.organisationUnitWithDataSetsFilter( $organisationUnit.children ))
-			<li>- <a href="selectDataSet.action?organisationUnitId=$child.id">$!encoder.htmlEncode( ${child.name} )</a></li>
+	#if( $organisationUnit.children.size() == 0 && $organisationUnit.dataSets.size() > 0 )
+		<li><a href="selectDataSet.action?organisationUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+	#else
+		#if( $organisationUnit.children.size() > 0 )
+			#set( $children = $sectionFormUtils.organisationUnitWithDataSetsFilter( $organisationUnit.children ) )
+
+			#if( $organisationUnit.dataSets.size() > 0 )
+				<li><a href="selectDataSet.action?organisationUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+			#else
+				<li>$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+			#end
+
+			#foreach( $child in $children )
+				<li>- <a href="selectDataSet.action?organisationUnitId=$child.id">$!encoder.htmlEncode( ${child.name} )</a></li>
+			#end
 		#end
 	#end
 #end