=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2012-11-15 14:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2012-11-30 15:43:14 +0000
@@ -39,8 +39,6 @@
 import org.hisp.dhis.i18n.I18n;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.setting.SystemSetting;
-import org.hisp.dhis.setting.SystemSettingManager;
 
 import java.util.*;
 
@@ -312,6 +310,11 @@
         {
             OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( multiOrganisationUnit );
 
+            if ( organisationUnit.getDataSets().contains( dataSet ) )
+            {
+                organisationUnits.add( organisationUnit );
+            }
+
             for ( OrganisationUnit child : organisationUnit.getChildren() )
             {
                 if ( child.getDataSets().contains( dataSet ) )