=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-07-15 07:44:23 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-07-15 08:11:32 +0000
@@ -119,7 +119,7 @@
         /light/selectBeneficiary.action?organisationUnitId=${orgUnitId}&current=${current}&validated=true
       </result>
       <result name="success_back_to_programstage" type="redirect">
-        /light/showPatientProgramStageList.action?patientId=${patientId}&amp;programInstanceId=${programInstanceId}&amp;programId=${programId}&amp;validated=true
+        /light/showPatientProgramList.action?patientId=${patientId}
       </result>
       <result name="register_next_duedate" type="redirect">
         showRepeatableEventRegistrationForm.action?programInstanceId=${programInstanceId}&amp;programStageId=${programStageId}&amp;currentProgramStageInstanceId=${programStageInstanceId}

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2012-06-27 10:03:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2012-07-15 08:11:32 +0000
@@ -13,7 +13,7 @@
 		#if( $validationMap.get( "incidentDate" ) )
            	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "incidentDate" ))</span>
      	#end
-		<input type="text" name="incidentDate" value="$!previousValues.get("incidentDate")" />
+    <input type="text" name="incidentDate" value="#if($previousValues.get("incidentDate"))$previousValues.get("incidentDate")#else$now#end" />
 	</p>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-07-15 07:44:23 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-07-15 08:11:32 +0000
@@ -21,9 +21,9 @@
 <p>
 <ul>
     <li><a href="showFindBeneficiaryForm.action">$i18n.getString( "find_beneficiary" )</a></li>
+    <li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString( "activity_plan" )</a></li>
     <li><a href="selectRegistrationOrganisationUnit.action">$i18n.getString( "beneficiary_registration" )</a></li>
     <!-- <li><a href="showBeneficiarySearchingForm.action">$i18n.getString( "beneficiary_enrollment" )</a></li> -->
-    <li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString( "activity_plan" )</a></li>
 </ul>
 </p>