=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java	2013-04-08 04:21:21 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java	2013-05-21 07:15:26 +0000
@@ -194,7 +194,6 @@
             {
                 String uid = identifierMatcher.group( 1 );
                 PatientIdentifierType identifierType = identifierTypeService.getPatientIdentifierType( uid );
-
                 if ( identifierType == null )
                 {
                     inputHtml = "<input value='[" + i18n.getString( "missing_patient_identifier_type" ) + " " + uid
@@ -208,6 +207,7 @@
                     {
                         PatientIdentifier patientIdentifier = identifierService.getPatientIdentifier( identifierType,
                             patient );
+
                         if ( patientIdentifier != null )
                         {
                             value = patientIdentifier.getIdentifier();
@@ -238,7 +238,7 @@
             {
                 String uid = dynamicAttrMatcher.group( 1 );
                 PatientAttribute attribute = attributeService.getPatientAttribute( uid );
-
+                
                 if ( attribute == null )
                 {
                     inputHtml = "<input value='[" + i18n.getString( "missing_patient_attribute" ) + " " + uid
@@ -359,7 +359,7 @@
         }
         else
         {
-            inputHtml += TAG_CLOSE;
+            inputHtml += " value=\"" + value + "\"" + TAG_CLOSE;
         }
         return inputHtml;
     }
@@ -503,6 +503,7 @@
     {
         try
         {
+
             return ProgramInstance.class.getMethod( "get" + property ).invoke( programInstance );
         }
         catch ( Exception ex )