=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java	2013-05-06 09:24:22 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java	2013-05-15 10:18:28 +0000
@@ -480,16 +480,10 @@
         String identifier = PatientIdentifierGenerator.getNewIdentifier( patient.getBirthDate(), gender );
 
         PatientIdentifier systemGenerateIdentifier = patientIdentifierService.get( null, identifier );
-        while ( systemGenerateIdentifier != null )
-        {
-            identifier = PatientIdentifierGenerator.getNewIdentifier( patient.getBirthDate(), patient.getGender() );
-            systemGenerateIdentifier = patientIdentifierService.get( null, identifier );
-        }
-
         systemGenerateIdentifier = new PatientIdentifier();
         systemGenerateIdentifier.setIdentifier( identifier );
         systemGenerateIdentifier.setPatient( patient );
-        patient.getIdentifiers().add( systemGenerateIdentifier );
+        patientIdentifierSet.add(systemGenerateIdentifier);
         
         for ( PatientAttribute patientAttribute : patientAttributes )
         {