=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java	2013-03-18 10:02:07 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java	2013-03-19 16:49:23 +0000
@@ -320,8 +320,8 @@
                 {
                     programs.add( program );
                 }
-                else if ( programInstanceService.getProgramInstances( patient, program, true ).size() > 0
-                    && !program.getOnlyEnrollOnce() )
+                else if ( programInstanceService.getProgramInstances( patient, program ).size() > 0
+                    && !program.getOnlyEnrollOnce() && programInstanceService.getProgramInstances( patient, program, false ).size() == 0)
                 {
                     programs.add( program );
                 }

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java	2013-03-18 08:35:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java	2013-03-19 16:49:23 +0000
@@ -539,7 +539,8 @@
 
             if ( previousPatientDataValue == null )
             {
-                patientDataValueService.savePatientDataValue( patientDataValue );
+                if ( patientDataValue.getValue() != null && !patientDataValue.getValue().trim().equals( "" ) )
+                    patientDataValueService.savePatientDataValue( patientDataValue );
             }
             else
             {