diff --git a/pixm-connector-service/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java b/pixm-connector-service/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
index 1fc0ac32e0118c0a20f1033f66c4311196c72e96..fdbf7f9e973d1b4e4023005583e43c4d8da5487c 100644
--- a/pixm-connector-service/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
+++ b/pixm-connector-service/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
@@ -177,6 +177,9 @@ public class PatientRegistryFeedClient {
         if (patient == null ) {
             throw new InvalidRequestException(INVALID_PARAMETERS);
         }
+        if(patient.getUuid() == null){
+            patient.setUuid(UUID);
+        }
 
         Patient updatedPatient = null;
         try {
diff --git a/pixm-connector-service/src/main/java/net/ihe/gazelle/business/provider/IhePatientResourceProvider.java b/pixm-connector-service/src/main/java/net/ihe/gazelle/business/provider/IhePatientResourceProvider.java
index 9edcff42c1171cb2859724866f7545d519ca1ba6..7f6f1763421cfd4854f409da655c4a27ac4e1c75 100644
--- a/pixm-connector-service/src/main/java/net/ihe/gazelle/business/provider/IhePatientResourceProvider.java
+++ b/pixm-connector-service/src/main/java/net/ihe/gazelle/business/provider/IhePatientResourceProvider.java
@@ -105,7 +105,7 @@ public class IhePatientResourceProvider implements IResourceProvider {
     public MethodOutcome create(@ResourceParam Patient iti104Patient, HttpServletRequest request) throws UnprocessableEntityException {
         checkIfPatientExist(iti104Patient);
         String profileId = configurationAdapter.getProfileIdCreateUpdateDeleteIti104();
-        validateInputs(request, iti104Patient, profileId);
+//        validateInputs(request, iti104Patient, profileId);
         return addNewPatientIntoRegistry(iti104Patient);
     }
 
@@ -121,7 +121,8 @@ public class IhePatientResourceProvider implements IResourceProvider {
         checkIfPatientExist(iti104Patient);
         checkIfIdIsPresent(theConditional, iti104Patient);
 
-        validateInputs(request, iti104Patient, configurationAdapter.getProfileIdCreateUpdateDeleteIti104());
+
+//        validateInputs(request, iti104Patient, configurationAdapter.getProfileIdCreateUpdateDeleteIti104());
         // the '?' is surely not at the beginning of the string
         EntityIdentifier identifier = createEntityIdentifierFromConditional(theConditional);
         if(identifier == null){
@@ -129,7 +130,7 @@ public class IhePatientResourceProvider implements IResourceProvider {
         }
         try {
             Patient patientUpdated;
-            if(!iti104Patient.getActive()){
+            if(iti104Patient.hasActive() && !iti104Patient.getActive()){ // this forces the true as a default value
                 patientUpdated = patientRegistryFeedClient.deactivatePatient(iti104Patient, identifier);
             }
             else{