=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java	2013-09-03 01:20:58 +0000
@@ -457,7 +457,7 @@
                     programStageInstance.setProgramStage( programStage );
 
                     Date dateCreatedEvent = sdf.parseDateTime( incidentDate ).toDate();
-                    if ( program.getGeneratedByEnrollmentDate() )
+                    if ( programStage.getGeneratedByEnrollmentDate() )
                     {
                         dateCreatedEvent = sdf.parseDateTime( enrollmentDate ).toDate();
                     }

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java	2013-09-03 01:20:58 +0000
@@ -267,7 +267,7 @@
         }
 
         if ( this.listOfProgramStageSections.size() == 0 && programStageInstance.isCompleted() == true
-            && programStage.getProgram().getBlockEntryForm() )
+            && programStage.getBlockEntryForm() )
         {
             return REDIRECT_COMPLETED_FORM;
         }