diff --git a/src/Adapters/FHIRPatientAdapter.php b/src/Adapters/FHIRPatientAdapter.php
index <HASH>..<HASH> 100644
--- a/src/Adapters/FHIRPatientAdapter.php
+++ b/src/Adapters/FHIRPatientAdapter.php
@@ -349,9 +349,19 @@ class FHIRPatientAdapter extends AbstractFHIRAdapter implements BaseAdapterInter
             $gender = $fhirPatient->getGender();
             $patientInterface->setGender($gender->getValue());
 
-            $phoneNumbers = $fhirPatient->getTelecom();
-            $primaryPhone = $phoneNumbers[0]->getValue();
-            $patientInterface->setPrimaryPhone($primaryPhone);
+            $contactPoints = $fhirPatient->getTelecom();
+            foreach ($contactPoints as $contactPoint) {
+                $system = $contactPoint->getSystem();
+                if ($system->getValue() == 'phone') {
+                    $primaryPhone = $contactPoint->getValue();
+                    $patientInterface->setPrimaryPhone($primaryPhone);
+                }
+                if ($system->getValue() == 'email') {
+                    $emailAdress = $contactPoint->getValue();
+                    $patientInterface->setEmailAddress($emailAdress);
+                }
+
+            }
 
             $extensions = $fhirPatient->getExtension();
             foreach ($extensions as $extension) {
Issue#<I> (#<I>)

* Add saving patient email



* Added system check for contactPoints