=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js	2011-08-10 13:44:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js	2011-08-11 07:20:39 +0000
@@ -22,6 +22,15 @@
 $( document ).ready( function()
 {
     selection.load();
+
+    jQuery( "body" ).bind( "ajaxComplete", function( e, xhr, settings )
+    {
+        if ( settings.url.indexOf( "getOrganisationUnitTree" ) )
+        {
+            selection.responseReceived();
+            jQuery( "body" ).unbind( "ajaxSuccess" );
+        }
+    } );
 } );
 
 // -----------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm	2011-08-08 15:09:46 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm	2011-08-11 07:20:39 +0000
@@ -1,13 +1,6 @@
 <script type="text/javascript">
 	jQuery(document).ready(function() {
 		selection.setListenerFunction( organisationUnitSelected );
-
-		jQuery("body").bind("ajaxSuccess", function(e, xhr, settings) {
-			if(settings.url.indexOf("getOrganisationUnitTree")) {
-				selection.responseReceived();
-				jQuery("body").unbind("ajaxSuccess");
-			}
-		});
 	});
 </script>