diff --git a/api/src/main/scala/com/lbs/api/json/model/EventsResponse.scala b/api/src/main/scala/com/lbs/api/json/model/EventsResponse.scala
index 4ebd0b1..df745c3 100644
--- a/api/src/main/scala/com/lbs/api/json/model/EventsResponse.scala
+++ b/api/src/main/scala/com/lbs/api/json/model/EventsResponse.scala
@@ -104,7 +104,7 @@ case class EventsResponse(events: List[Event]) extends SerializableJsonObject
 case class Event(
   date: ZonedDateTime,
   clinic: Option[EventClinic],
-  doctor: EventDoctor,
+  doctor: Option[EventDoctor],
   eventId: Long,
   status: String,
   title: String
diff --git a/server/src/main/scala/com/lbs/server/lang/En.scala b/server/src/main/scala/com/lbs/server/lang/En.scala
index 7b9c42a..27f3484 100644
--- a/server/src/main/scala/com/lbs/server/lang/En.scala
+++ b/server/src/main/scala/com/lbs/server/lang/En.scala
@@ -39,7 +39,9 @@ object En extends Lang {
     s"""<b>➡</b> Are you sure want to cancel appointment?
        |
        |⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("No specified")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
@@ -203,7 +205,9 @@ object En extends Lang {
 
   override def historyEntry(event: Event, page: Int, index: Int): String =
     s"""⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("No specified")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
@@ -216,7 +220,9 @@ object En extends Lang {
 
   override def reservedVisitEntry(event: Event, page: Int, index: Int): String =
     s"""⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("No specified")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
diff --git a/server/src/main/scala/com/lbs/server/lang/Pl.scala b/server/src/main/scala/com/lbs/server/lang/Pl.scala
index 1ea4885..a072d9d 100644
--- a/server/src/main/scala/com/lbs/server/lang/Pl.scala
+++ b/server/src/main/scala/com/lbs/server/lang/Pl.scala
@@ -39,7 +39,9 @@ object Pl extends Lang {
     s"""<b>➡</b> Czy na pewno chcesz anulować wizytę?
        |
        |⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("Nie podano")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
@@ -205,7 +207,9 @@ object Pl extends Lang {
 
   override def historyEntry(event: Event, page: Int, index: Int): String =
     s"""⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("Nie podano")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
@@ -218,7 +222,9 @@ object Pl extends Lang {
 
   override def reservedVisitEntry(event: Event, page: Int, index: Int): String =
     s"""⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("Nie podano")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
diff --git a/server/src/main/scala/com/lbs/server/lang/Ua.scala b/server/src/main/scala/com/lbs/server/lang/Ua.scala
index 229b542..c248784 100644
--- a/server/src/main/scala/com/lbs/server/lang/Ua.scala
+++ b/server/src/main/scala/com/lbs/server/lang/Ua.scala
@@ -39,7 +39,9 @@ object Ua extends Lang {
     s"""<b>➡</b> Ви впевнені, що хочете скасувати візит?
        |
        |⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("Не вказано")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
@@ -203,11 +205,13 @@ object Ua extends Lang {
 
   override def historyEntry(event: Event, page: Int, index: Int): String =
     s"""⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("Не вказано")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")
-        .getOrElse("Telemedicine")}
+        .getOrElse("Телемедицина")}
        |
        |""".stripMargin
 
@@ -216,7 +220,9 @@ object Ua extends Lang {
 
   override def reservedVisitEntry(event: Event, page: Int, index: Int): String =
     s"""⏱ <b>${formatDateTime(event.date, locale)}</b>
-       |${capitalize(doctor)}: ${capitalize(event.doctor.name)} ${capitalize(event.doctor.lastname)}
+       |${capitalize(doctor)}: ${event.doctor
+        .map(d => s"${capitalize(d.name)} ${capitalize(d.lastname)}")
+        .getOrElse("Не вказано")}
        |${capitalize(service)}: ${event.title}
        |${capitalize(clinic)}: ${event.clinic
         .map(c => s"${capitalize(c.city)} - ${capitalize(c.address)}")