diff --git a/.gitignore b/.gitignore
index 6d75aeb7..e4de8bcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@
 .idea
 .gradle
 .DS_Store
+**/.project
+**/.settings
+/.classpath
 # CMake
 cmake-build-*/
 
diff --git a/client/package.json b/client/package.json
index 3b837a6d..8fff87ed 100644
--- a/client/package.json
+++ b/client/package.json
@@ -19,6 +19,7 @@
     "register-service-worker": "^1.6.2",
     "vue": "^2.6.11",
     "vue-router": "^3.1.5",
+    "vue-typed-mixins": "^0.2.0",
     "vuex": "^3.1.2",
     "vuex-smart-module": "^0.3.4"
   },
diff --git a/client/src/api/SwaggerApi.ts b/client/src/api/SwaggerApi.ts
index 7501f284..9cb4a1ca 100644
--- a/client/src/api/SwaggerApi.ts
+++ b/client/src/api/SwaggerApi.ts
@@ -125,6 +125,32 @@ export interface Doctor {
   zip?: string;
 }
 
+export interface ExposureContactContactView {
+  firstName?: string;
+  id?: string;
+  inQuarantine?: boolean;
+  infected?: boolean;
+  lastName?: string;
+}
+
+export interface ExposureContactFromServer {
+  comment?: string;
+  contact?: ExposureContactContactView;
+  context?: string;
+  dateOfContact?: string;
+  id?: number;
+  source?: ExposureContactContactView;
+}
+
+export interface ExposureContactToServer {
+  comment?: string;
+  contact?: string;
+  context?: string;
+  dateOfContact?: string;
+  id?: number;
+  source?: string;
+}
+
 export interface GrantedAuthority {
   authority?: string;
 }
@@ -511,7 +537,7 @@ type ApiConfig<SecurityDataType> = {
 };
 
 class HttpClient<SecurityDataType> {
-  public baseUrl: string = "//localhost:8642/";
+  public baseUrl: string = "//localhost/";
   private securityData: SecurityDataType = null as any;
   private securityWorker: ApiConfig<SecurityDataType>["securityWorker"] = (() => {}) as any;
 
@@ -589,7 +615,7 @@ class HttpClient<SecurityDataType> {
 /**
  * @title Api Documentation
  * @version 1.0
- * @baseUrl //localhost:8642/
+ * @baseUrl //localhost/
  * Api Documentation
  */
 export class Api<SecurityDataType = any> extends HttpClient<SecurityDataType> {
@@ -705,6 +731,78 @@ export class Api<SecurityDataType = any> extends HttpClient<SecurityDataType> {
     addScheduledEventUsingPost: (dto: RequestLabTestDTO, params?: RequestParams) =>
       this.request<PatientEvent, any>(`/api/doctor/create_appointment`, "POST", params, dto, true),
 
+    /**
+     * @tags exposure-contact-controller
+     * @name createExposureContactUsingPOST
+     * @summary createExposureContact
+     * @request POST:/api/exposure-contacts
+     * @secure
+     */
+    createExposureContactUsingPost: (dto: ExposureContactToServer, params?: RequestParams) =>
+      this.request<ExposureContactFromServer, any>(`/api/exposure-contacts`, "POST", params, dto, true),
+
+    /**
+     * @tags exposure-contact-controller
+     * @name updateExposureContactUsingPUT
+     * @summary updateExposureContact
+     * @request PUT:/api/exposure-contacts
+     * @secure
+     */
+    updateExposureContactUsingPut: (contact: ExposureContactToServer, params?: RequestParams) =>
+      this.request<ExposureContactFromServer, any>(`/api/exposure-contacts`, "PUT", params, contact, true),
+
+    /**
+     * @tags exposure-contact-controller
+     * @name getExposureSourceContactsForPatientUsingGET
+     * @summary getExposureSourceContactsForPatient
+     * @request GET:/api/exposure-contacts/by-contact/{id}
+     * @secure
+     */
+    getExposureSourceContactsForPatientUsingGet: (id: string, params?: RequestParams) =>
+      this.request<ExposureContactFromServer[], any>(
+        `/api/exposure-contacts/by-contact/${id}`,
+        "GET",
+        params,
+        null,
+        true,
+      ),
+
+    /**
+     * @tags exposure-contact-controller
+     * @name getExposureContactsForPatientUsingGET
+     * @summary getExposureContactsForPatient
+     * @request GET:/api/exposure-contacts/by-source/{id}
+     * @secure
+     */
+    getExposureContactsForPatientUsingGet: (id: string, params?: RequestParams) =>
+      this.request<ExposureContactFromServer[], any>(
+        `/api/exposure-contacts/by-source/${id}`,
+        "GET",
+        params,
+        null,
+        true,
+      ),
+
+    /**
+     * @tags exposure-contact-controller
+     * @name getExposureContactUsingGET
+     * @summary getExposureContact
+     * @request GET:/api/exposure-contacts/{id}
+     * @secure
+     */
+    getExposureContactUsingGet: (id: number, params?: RequestParams) =>
+      this.request<ExposureContactFromServer, any>(`/api/exposure-contacts/${id}`, "GET", params, null, true),
+
+    /**
+     * @tags exposure-contact-controller
+     * @name removeExposureContactUsingDELETE
+     * @summary removeExposureContact
+     * @request DELETE:/api/exposure-contacts/{id}
+     * @secure
+     */
+    removeExposureContactUsingDelete: (id: number, params?: RequestParams) =>
+      this.request<any, any>(`/api/exposure-contacts/${id}`, "DELETE", params, null, true),
+
     /**
      * @tags institution-controller
      * @name createInstitutionUsingPOST
diff --git a/client/src/components/DateInput.vue b/client/src/components/DateInput.vue
index 8fcc85f3..a36a4e31 100644
--- a/client/src/components/DateInput.vue
+++ b/client/src/components/DateInput.vue
@@ -1,21 +1,20 @@
 <template>
-  <a-form-item :label="label">
-    <a-date-picker
-      :disabled="disabled"
-      :format="dateFormat"
-      :open="dateOfBirthPickerOpen"
-      @focus="datePickerFocused"
-      @openChange="openChanged"
-      placeholder="TT.MM.JJJJ (z.B. 28.02.1986)"
-      style="width: 100%"
-      v-decorator="decorator"
-    />
-  </a-form-item>
+  <a-date-picker
+    v-bind="$attrs"
+    v-on="$listeners"
+    :value="value"
+    :format="format"
+    :open="open || dateOfBirthPickerOpen"
+    @focus="datePickerFocused"
+    @openChange="openChanged"
+    :placeholder="placeholder"
+  />
 </template>
 
 <script lang="ts">
-
 import Vue from 'vue'
+import mixins from 'vue-typed-mixins'
+import { FormControlMixin } from '@/util/forms'
 
 /**
  * Input that supports 1d and 2d Barcodes
@@ -27,17 +26,25 @@ import Vue from 'vue'
 export interface State {
   dateOfBirthPickerOpen: boolean;
   wasJustFocused: boolean;
-  dateFormat: string;
 }
 
-export default Vue.extend({
-  name: 'LaboratoryInput',
-  props: ['decorator', 'label', 'disabled'],
+export default mixins(FormControlMixin).extend({
+  name: 'DateInput',
+  mixins: [FormControlMixin],
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: { default: undefined },
+    open: { default: false },
+    placeholder: { default: 'TT.MM.JJJJ (z.B. 28.02.1986)' },
+    format: { default: 'DD.MM.YYYY' },
+  },
   data(): State {
     return {
       dateOfBirthPickerOpen: false,
       wasJustFocused: false,
-      dateFormat: 'DD.MM.YYYY',
     }
   },
   methods: {
diff --git a/client/src/components/EditExposureContact.vue b/client/src/components/EditExposureContact.vue
new file mode 100644
index 00000000..622d147f
--- /dev/null
+++ b/client/src/components/EditExposureContact.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="edit-exposure-contact">
+    <a-form-item style="display: none;"
+      :selfUpdate="true">
+      <a-input type="hidden"
+        v-decorator="[ formInputKey('id') ]"/>
+    </a-form-item>
+    <a-row class="patients-flex">
+      <!-- Originating and Contact Names -->
+      <a-form-item
+        :style="`display: ${$props.showOriginatorPatient ? 'unset' : 'none'}`"
+        :selfUpdate="true"
+        label="Ursprungspatient"
+        class="patient-input">
+        <patient-input
+          v-bind="inputProps.source"
+          :disabled="$props.disableOriginatorPatient"
+          :filterOption="filterSources"
+          v-decorator="[ formInputKey('source'), {
+              rules: [
+                { required: true, message: 'Bitte Ursprungspatienten angeben' },
+              ],
+          }]"/>
+      </a-form-item>
+      <a-icon
+        v-if="$props.showOriginatorPatient && $props.showContactPatient"
+        type="swap"/>
+      <a-form-item
+        :style="`display: ${$props.showContactPatient ? 'unset' : 'none'}`"
+        :selfUpdate="true"
+        label="Kontaktperson"
+        class="patient-input">
+        <patient-input
+          v-bind="inputProps.contact"
+          :disabled="$props.disableContactPatient"
+          :filterOption="filterContacts"
+          v-decorator="[ formInputKey('contact'), {
+              rules: [
+                { required: true, message: 'Bitte Kontaktperson angeben' },
+              ],
+          }]"/>
+      </a-form-item>
+    </a-row>
+    <a-row>
+      <!-- When and How -->
+      <a-col :md="11" :sm="24">
+        <a-form-item label="Datum des Kontakts"
+          :selfUpdate="true">
+          <date-input
+            v-bind="inputProps.dateOfContact"
+            :disabledDate="date => date.isAfter(moment())"
+            v-decorator="[ formInputKey('dateOfContact'), {
+              rules: [
+                { required: true, message: 'Bitte ein gültiges Datum angeben' },
+              ],
+            }]"/>
+        </a-form-item>
+      </a-col>
+      <a-col :md="2" :sm="0"></a-col>
+      <a-col :md="11" :sm="24">
+        <a-form-item label="Umgebung / Kontext"
+          :selfUpdate="true">
+          <a-auto-complete
+            v-bind="inputProps.context"
+            :dataSource="contexts"
+            :filterOption="false"
+            v-decorator="[ formInputKey('context'), {
+              rules: [
+                { required: true, message: 'Bitte den Umstand des Kontakts angeben' }
+              ]
+            }]"/>
+        </a-form-item>
+      </a-col>
+    </a-row>
+    <a-row>
+      <!-- Comment Space -->
+      <a-form-item label="Sonstiges / Kommentar"
+        :selfUpdate="true">
+        <a-textarea
+          v-bind="inputProps.comment"
+          v-decorator="[ formInputKey('comment'), {
+            rules: [],
+          }]"/>
+      </a-form-item>
+    </a-row>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import mixins from 'vue-typed-mixins'
+import Api from '@/api'
+import moment from 'moment'
+
+import DateInput from '@/components/DateInput.vue'
+import PatientInput from '@/components/PatientInput.vue'
+import { FormGroupMixin } from '@/util/forms.ts'
+
+const exposureContexts = [
+  'Haushaltskontakt',
+  'Berufskontakt',
+  'Kontakt in Gemeinschaftseinrichtung',
+]
+
+export default mixins(FormGroupMixin).extend({
+  name: 'EditExposureFormGroup',
+  components: {
+    DateInput,
+    PatientInput,
+  },
+  inputKeys: ['id', 'source', 'contact', 'dateOfContact', 'context', 'comment'],
+  props: {
+    showOriginatorPatient: { default: true },
+    showContactPatient: { default: true },
+    disableOriginatorPatient: { default: false },
+    disableContactPatient: { default: false },
+  },
+  data() {
+    return {
+      contexts: exposureContexts,
+    }
+  },
+  methods: {
+    moment,
+    filterContacts(inputVal: string, option: any): boolean {
+      return option.key !== (this as any).getSingleValue('source')
+    },
+    filterSources(inputVal: string, option: any): boolean {
+      return option.key !== (this as any).getSingleValue('contact')
+    },
+  },
+} as any)
+</script>
+
+<style lang="scss">
+  .edit-exposure-contact {
+    .patients-flex {
+      display: flex;
+      flex-flow: row wrap;
+      align-items: center;
+      align-content: center;
+      justify-content: center;
+    }
+
+    .patients-flex > * {
+      flex: 1 1;
+    }
+
+    .patients-flex > .patient-input {
+      min-width: 47%;
+    }
+  }
+</style>
diff --git a/client/src/components/PatientInput.vue b/client/src/components/PatientInput.vue
index cab2af0b..310ac0c5 100644
--- a/client/src/components/PatientInput.vue
+++ b/client/src/components/PatientInput.vue
@@ -1,21 +1,33 @@
 <template>
-  <a-form-item :label="label">
-    <a-auto-complete :defaultActiveFirstOption="false" @search="handleSearch" @select="emitSelection"
-                     placeholder="Suche über ID, Name, Telefon, Mail" v-decorator="validation">
-      <template slot="dataSource">
-        <a-select-option :key="patient.id" v-for="patient in result">
-          {{patient.firstName}} {{patient.lastName}} ({{patient.id}})
-        </a-select-option>
-      </template>
-    </a-auto-complete>
-  </a-form-item>
+  <a-select ref="input" v-bind="$attrs" v-on="externListeners"
+                   :defaultActiveFirstOption="false"
+                   :placeholder="placeholder"
+                   :showSearch="true"
+                   :showArrow="false"
+                   :filterOption="filterOption"
+                   :value="value"
+                   @search="handleSearch">
+    <a-select-option v-for="entry in result"
+      :key="entry.value">
+      {{ entry.label }}
+    </a-select-option>
+  </a-select>
 </template>
 
 <script lang="ts">
-
 import Api from '@/api'
 import Vue from 'vue'
+import mixins from 'vue-typed-mixins'
+import { Select } from 'ant-design-vue'
 import { Patient } from '@/api/SwaggerApi'
+import { FormControlMixin } from '@/util/forms'
+
+declare interface State {
+  result: {
+    label?: string;
+    value?: string;
+  }[];
+}
 
 /**
  * Autocomplete for Patients
@@ -24,19 +36,51 @@ import { Patient } from '@/api/SwaggerApi'
  * - validation: put in v-decorator object
  */
 
-interface State {
-  result: Patient[];
-}
-
-export default Vue.extend({
+export default mixins(FormControlMixin).extend({
   name: 'PatientInput',
-  props: ['validation', 'label', 'form'],
+  inheritAttrs: false,
+  props: {
+    placeholder: { default: 'Suche über ID, Name, Telefon, Mail' },
+    value: { default: '' },
+    filterOption: { default: false },
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  fieldValueConvert(val: any): string {
+    const hasProp = (obj: Record<string, any>, prop: string): boolean =>
+      Object.prototype.hasOwnProperty.call(obj, prop)
+
+    if (typeof val === 'object' && hasProp(val, 'id')) {
+      const patient = val as Patient
+      this.result = [{
+        label: this.getPatientLabel(patient),
+        value: patient.id,
+      }]
+      return patient.id || ''
+    } else {
+      return val
+    }
+  },
+  inject: {
+    FormContext: { default: () => ({}) },
+  },
   data(): State {
     return {
       result: [],
     }
   },
+  computed: {
+    externListeners() {
+      const { search, ...listeners } = this.$listeners
+      return listeners
+    },
+  },
   methods: {
+    getPatientLabel(patientData: Patient) {
+      return `${patientData.firstName} ${patientData.lastName} (${patientData.id})`
+    },
     async handleSearch(value: string) {
       let result: Patient[]
       if (!value || value.length < 2) {
@@ -50,10 +94,10 @@ export default Vue.extend({
           orderBy: 'lastName',
         })
       }
-      this.result = result
-    },
-    emitSelection(value: string) {
-      this.$emit('select', value)
+      this.result = result.map((patient: Patient) => ({
+        label: this.getPatientLabel(patient),
+        value: patient.id,
+      }))
     },
   },
 })
diff --git a/client/src/components/PatientStammdaten.vue b/client/src/components/PatientStammdaten.vue
index 295f72dc..6bce5134 100644
--- a/client/src/components/PatientStammdaten.vue
+++ b/client/src/components/PatientStammdaten.vue
@@ -53,10 +53,12 @@
           </a-form-item>
         </a-col>
         <a-col :lg="12" :sm="24">
-          <DateInput :decorator="['dateOfBirth', { rules: [{
-                        required: true,
-                        message: 'Bitte Geburtsdatum eingeben',
-                      }], initialValue: initialDateOfBirth}]" label="Geburtsdatum" />
+          <a-form-item label="Geburtsdatum">
+            <DateInput v-decorator="['dateOfBirth', { rules: [{
+                          required: true,
+                          message: 'Bitte Geburtsdatum eingeben',
+                        }], initialValue: initialDateOfBirth}]" />
+          </a-form-item>
         </a-col>
       </a-row>
 
@@ -85,9 +87,10 @@
           </a-form-item>
         </a-col>
         <a-col :lg="12" :sm="24">
-          <DateInput :decorator="['dateOfDeath', {initialValue: initialDateOfDeath}]"
-                     :disabled="!showDateOfDeath"
-                     label="Todesdatum" />
+          <a-form-item label="Todesdatum">
+            <DateInput v-decorator="['dateOfDeath', {initialValue: initialDateOfDeath}]"
+                       :disabled="!showDateOfDeath" />
+          </a-form-item>
         </a-col>
       </a-row>
 
diff --git a/client/src/util/forms.ts b/client/src/util/forms.ts
new file mode 100644
index 00000000..4db6bfc5
--- /dev/null
+++ b/client/src/util/forms.ts
@@ -0,0 +1,232 @@
+import Vue from 'vue'
+
+// Realise camelCase prefixing, whereas the prefixed name starts with capital
+function prefixed(name: string, prefix?: string): string {
+  if (!prefix) {
+    return name
+  } else {
+    return prefix + name.charAt(0).toUpperCase() + name.substring(1)
+  }
+}
+function prefixedKeysObject(keys: {[x: string]: any}, prefix?: string): {[x: string]: any} {
+  return Object.fromEntries((Object.entries(keys) as [string, string][]).map(
+    (entry: [string, string]) => [prefixed(entry[0], prefix), entry[1]],
+  ))
+}
+function prefixedKeysArray(keys: string[], prefix?: string): string[] {
+  return keys.map((key: string) => prefixed(key, prefix))
+}
+
+declare interface FormGroupMixinType {
+  $options: {
+    name: string;
+    inputKeys: string[];
+  };
+  $props: {
+    inputKeyPrefix?: string;
+    inputKeys: { [x: string]: string };
+    inputProps: Record<string, any>;
+  };
+  $watch: any;
+  $forceUpdate: () => void;
+
+  formInputKey: (this: FormGroupMixinType, key: string) => string;
+  FormContext: any;
+
+  prefixedKeysObject: (this: FormGroupMixinType, keys: {[x: string]: any}, prefix?: string) => {[x: string]: any};
+  prefixedKeysArray: (this: FormGroupMixinType, keys: string[], prefix?: string) => string[];
+  getData(this: FormGroupMixinType, fieldNames?: string[], usesPrefixedKeys?: boolean): {[x: string]: any};
+}
+
+declare module 'vue/types/options' {
+  interface ComponentOptions<V extends Vue> {
+    inputKeys?: string[];
+  }
+}
+
+export const FormGroupMixin = Vue.extend({
+  props: {
+    inputKeyPrefix: {
+      default: undefined,
+    },
+    inputKeys: {
+      default: () => ({}),
+    },
+    inputProps: {
+      default(this: FormGroupMixinType) {
+        return Object.fromEntries(
+          this.$options.inputKeys!.map((key: string) => [key, {}]),
+        )
+      },
+    },
+  },
+  inject: {
+    FormContext: { default: () => ({}) },
+  },
+  mounted(this: FormGroupMixinType) {
+    if (this.$options.inputKeys) {
+      // Make sure all form items use selfUpdate; this is crucial for form items
+      // in the group to be re-rendered correctly when new values are set
+      this.$options.inputKeys.forEach((key: string) => {
+        if (!this.FormContext.form.formItems[this.formInputKey(key)].itemSelfUpdate) {
+          console.error(`[ ${this.$options.name} ]: ` +
+            `\`itemSelfUpdate\` is not enabled for form item of \`${key}\`. ` +
+            'This may lead to contents not being re-rendered when their ' +
+            'value is modified by calling `setFieldsValue` on its ' +
+            'containing form. To fix this, add `:selfUpdate="true"` to ' +
+            `the \`a-form-item\` component containing the \`${key}\` control ` +
+            'or add `:selfUpdate="true"` to the root `a-form` element.',
+          )
+        }
+      })
+    }
+  },
+  methods: {
+    formInputKey(this: FormGroupMixinType, key: string): string {
+      const propKeys = this.$props.inputKeys
+      return Object.prototype.hasOwnProperty.call(propKeys, key)
+        ? propKeys[key]
+        : prefixed(key, this.$props.inputKeyPrefix)
+    },
+    prefixedKeysObject(this: FormGroupMixinType, keys: {[x: string]: any}): {[x: string]: any} {
+      return prefixedKeysObject(keys, this.$props.inputKeyPrefix)
+    },
+    prefixedKeysArray(this: FormGroupMixinType, keys: string[]): string[] {
+      return prefixedKeysArray(keys, this.$props.inputKeyPrefix)
+    },
+    setData(this: FormGroupMixinType, data: {[x: string]: any}, usesPrefixedKeys: boolean | undefined) {
+      if (!this.$options.inputKeys) {
+        throw new Error(`[ ${this.$options.name} ]: \`setData\` not supported`)
+      }
+
+      if (!usesPrefixedKeys) {
+        data = this.prefixedKeysObject(data)
+      }
+      if (data) {
+        const prefixedInputKeys = prefixedKeysArray(this.$options.inputKeys)
+        data = Object.fromEntries(Object.entries(data).filter(
+          (value: [string, any]) => prefixedInputKeys.includes(value[0]),
+        ))
+      }
+      this.FormContext.form.setFieldsValue(data)
+    },
+    getData(this: FormGroupMixinType, fieldNames?: string[], usesPrefixedKeys?: boolean): {[x: string]: any} {
+      if (!this.$options.inputKeys) {
+        throw new Error(`[ ${this.$options.name} ]: \`getData\` not supported`)
+      }
+
+      if (fieldNames !== undefined && !usesPrefixedKeys) {
+        fieldNames = this.prefixedKeysArray(fieldNames)
+      }
+
+      const permittedFieldNames = prefixedKeysArray(this.$options.inputKeys)
+      if (fieldNames === undefined) {
+        fieldNames = permittedFieldNames
+      } else {
+        fieldNames = fieldNames.filter(
+          (fieldName: string) => permittedFieldNames.includes(fieldName),
+        )
+      }
+      return this.FormContext.form.getFieldsValue(fieldNames)
+    },
+    getSingleValue(this: FormGroupMixinType, fieldName: string, usesPrefixedKeys?: boolean): any | undefined {
+      const key = usesPrefixedKeys ? fieldName : this.formInputKey(fieldName)
+      return this.getData([key], true)[key]
+    },
+  },
+})
+
+declare interface FormControlMixinType {
+  $options: {
+    fieldValueConvert?: (val: any) => any;
+    forwardEvents?: string[];
+    model?: {
+      prop?: string;
+      event?: string;
+    };
+  };
+  $attrs: {
+    'data-__field'?: {
+      name: string;
+      value: any;
+    };
+  };
+  $emit: (event: string, param?: any) => void;
+  $watch: (expr: string, cb: (val: any) => void) => void;
+
+  FormContext?: {
+    form: {
+      setFieldsValue: (fields: { [x: string]: any }) => void;
+    };
+  };
+
+  FormControlConvValue: any;
+  fieldName: string | null;
+  isDecoratedFormField(): boolean;
+  getOwnValue(): any;
+  setOwnValue(val: any): void;
+}
+
+declare module 'vue/types/options' {
+  interface ComponentOptions<V extends Vue> {
+    fieldValueConvert?(value: any): any;
+  }
+}
+
+export const FormControlMixin = Vue.extend({
+  inject: {
+    FormContext: { default: null },
+  },
+  computed: {
+    fieldName(this: FormControlMixinType): string | null {
+      if (this.FormContext && this.$attrs['data-__field']) {
+        return this.$attrs['data-__field'].name
+      } else {
+        return null
+      }
+    },
+  },
+  data() {
+    return {
+      FormControlConvValue: undefined,
+    }
+  },
+  created(this: FormControlMixinType) {
+    if (this.$options.fieldValueConvert) {
+      const valueProp = (this.$options.model && this.$options.model.prop)
+        ? this.$options.model.prop
+        : 'value'
+
+      this.$watch(valueProp, (value: any) => {
+        if (this.FormControlConvValue === value) {
+          // Value has already been converted
+          this.FormControlConvValue = undefined
+        } else if (this.$options.fieldValueConvert) {
+          const newValue = this.$options.fieldValueConvert.call(this, value)
+          if (newValue !== value) {
+            this.FormControlConvValue = newValue
+            this.setOwnValue(newValue)
+          }
+        }
+      })
+    }
+  },
+  methods: {
+    isDecoratedFormField(this: FormControlMixinType): boolean {
+      return !!(this.FormContext && this.$attrs['data-__field'])
+    },
+    setOwnValue(this: FormControlMixinType, value: any) {
+      const eventType = (this.$options.model && this.$options.model.event)
+        ? this.$options.model.event
+        : 'change'
+
+      this.$emit(eventType, value)
+    },
+    getOwnValue(this: FormControlMixinType) {
+      const valueProp = (this.$options.model && this.$options.model.prop)
+        ? this.$options.model.prop
+        : 'value'
+      return (this as {[x: string]: any})[valueProp]
+    },
+  },
+})
diff --git a/client/src/util/mapping.ts b/client/src/util/mapping.ts
new file mode 100644
index 00000000..0dffd723
--- /dev/null
+++ b/client/src/util/mapping.ts
@@ -0,0 +1,27 @@
+export declare interface MapperDefEntry {
+  transform: (x: any) => any;
+}
+export declare type MapperDef = { [x: string]: ((x: any) => any | Partial<MapperDefEntry>) };
+
+export function map(object: {[x: string]: any}, mapperDef: MapperDef) {
+  return Object.fromEntries(Object.entries(object).map(
+    (entry: [any, any]) => {
+      let [key, val] = entry
+      let mapperEntry: any = mapperDef[key]
+
+      if (mapperEntry) {
+        if (typeof mapperEntry === 'function') {
+          mapperEntry = { transform: mapperEntry as (value: any) => any }
+        }
+
+        if (Object.prototype.hasOwnProperty.call(mapperEntry, 'transform')) {
+          val = mapperEntry.transform(val)
+        }
+
+        entry = [key, val]
+      }
+
+      return entry
+    },
+  ))
+}
diff --git a/client/src/views/PatientDetails.vue b/client/src/views/PatientDetails.vue
index 779d25e9..dd4a29d1 100644
--- a/client/src/views/PatientDetails.vue
+++ b/client/src/views/PatientDetails.vue
@@ -8,11 +8,11 @@
     />
     <div style="max-width: 1020px; margin: 0 auto; padding: 0 1rem">
       <a-tabs
-        defaultActiveKey="1"
+        defaultActiveKey="overview"
         v-if="patient"
       >
         <a-tab-pane
-          key="1"
+          key="overview"
           tab="Falldaten"
         >
           <div style="display: flex; justify-content: flex-end; padding-bottom: 10px">
@@ -60,6 +60,8 @@
                     <tr>
                       <td>Geburtsdatum:</td>
                       <td>{{dateOfBirth}}</td>
+                    </tr>
+                    <tr>
                       <td>Geschlecht:</td>
                       <td>{{gender}}</td>
                     </tr>
@@ -190,7 +192,32 @@
             <!-- Symptome und Risiken -->
             <a-row :gutter="8" style="margin-top: 8px;">
               <a-col
-                :md="12"
+                :md="8"
+                :span="24"
+              >
+                <a-card
+                  align="left"
+                  title="Infektionskette"
+                >
+                  <a-descriptions layout="vertical" :column="1">
+                    <a-descriptions-item>
+                      <span slot="label"><a-icon type="arrow-right"/><a-icon type="user" style="margin-right: 5px;"/> Kontakte mit Indexpatienten</span>
+                      <span v-if="patientInfectionSources.length > 0">{{ patientInfectionSources.length }}</span>
+                      <span v-else>Keine</span>
+                      bekannt
+                    </a-descriptions-item>
+                    <a-descriptions-item>
+                      <span slot="label"><a-icon type="user"/><a-icon type="arrow-right" style="margin-right: 5px;"/> Eigene Kontaktpersonen</span>
+                      <span v-if="exposureContacts.length > 0">{{ exposureContacts.length }}</span>
+                      <span v-else>Keine</span>
+                      angegeben
+                    </a-descriptions-item>
+                  </a-descriptions>
+                </a-card>
+              </a-col>
+
+              <a-col
+                :md="8"
                 :span="24"
               >
                 <a-card
@@ -201,7 +228,7 @@
                 </a-card>
               </a-col>
               <a-col
-                :md="12"
+                :md="8"
                 :span="24"
               >
                 <a-card
@@ -218,7 +245,7 @@
         </a-tab-pane>
         <a-tab-pane
           forceRender
-          key="2"
+          key="timeline"
           tab="Verlauf"
         >
           <a-card>
@@ -238,6 +265,129 @@
             </a-timeline>
           </a-card>
         </a-tab-pane>
+        <a-tab-pane
+          forceRender
+          key="infection-chain"
+          tab="Infektionskette">
+
+          <a-row :gutter="8" style="margin-top: 8px;">
+            <a-card
+              align="left"
+              title="Infektionsquellen"
+            >
+              <a-descriptions layout="vertical" :column="{ xs: 1, sm: 1, md: 2, lg: 2 }">
+                <a-descriptions-item>
+                  <span slot="label"><a-icon type="user" style="margin-right: 5px;"/> Kontakte mit Indexpatienten <span v-if="patientInfectionSources.length > 0">({{ patientInfectionSources.length }})</span></span>
+                  <div v-if="patientInfectionSources.length > 0">
+                    <a-table class="table-index-patients"
+                      :columns="columnsIndexPatients"
+                      :dataSource="patientInfectionSources"
+                      :rowKey="contact => contact.id"
+                      :showHeader="false"
+                      :pagination="false"
+                    >
+                      <template slot="name" slot-scope="contact">
+                        <a @click="showPatient(contact.source.id)">{{ contact.source.firstName }} {{ contact.source.lastName }}</a>,
+                      </template>
+                      <template slot="dateOfContact" slot-scope="contact">
+                        am {{ moment(contact.dateOfContact).format('DD.MM.YYYY') }},
+                      </template>
+                    </a-table>
+                  </div>
+                  <div v-else>
+                    Keine bekannt
+                  </div>
+                </a-descriptions-item>
+                <a-descriptions-item
+                  label="Sonstige">
+                  Keine bekannt
+                </a-descriptions-item>
+              </a-descriptions>
+            </a-card>
+          </a-row>
+
+          <!-- exposed contacts -->
+          <a-row :gutter="8" style="margin-top: 8px;">
+            <a-card
+              title="Kontaktpersonen"
+              align="left"
+            >
+              <div slot="extra">
+                <a-button
+                  icon="plus"
+                  type="primary"
+                  @click="addExposureContact">
+                  Hinzufügen
+                </a-button>
+              </div>
+
+              <a-table
+                :columns="columnsExposureContacts"
+                :pagination="false"
+                :dataSource="exposureContacts"
+                class="imis-table-no-pagination"
+                :rowKey="contact => contact.contact.id"
+                :loading="exposureContactsLoading"
+                :customRow="contact => ({
+                  on: { dblclick: () => showExposureContact(contact.id) }
+                })">
+                <template slot="gotoPatient" slot-scope="contact">
+                  <a-button ghost
+                    icon="user"
+                    type="primary"
+                    title="Patientendaten anzeigen"
+                    @click="showPatient(contact.contact.id)"/>
+                </template>
+                <template slot="dateOfContact" slot-scope="contact">
+                  {{ moment(contact.dateOfContact).format('DD.MM.YYYY') }}
+                </template>
+                <template slot="infectionState" slot-scope="contact">
+                  <span v-if="contact.contact.infected"
+                    style="color: red;">
+                    Infiziert
+                  </span>
+                  <span v-else>
+                    Unbekannt
+                  </span>
+                </template>
+                <template slot="quarantineState" slot-scope="contact">
+                  <span v-if="contact.contact.inQuarantine">
+                    In Quarantäne
+                  </span>
+                  <span v-else
+                    :style="`color: ${contact.contact.infected ? 'red' : 'unset'};`">
+                    Keine Quarantäne
+                  </span>
+                </template>
+                <template slot="actions" slot-scope="contact">
+                  <div class="inline-buttons">
+                    <a-button ghost
+                      icon="edit"
+                      type="primary"
+                      title="Bearbeiten"
+                      @click="showExposureContact(contact.id)"/>
+                    <a-button ghost
+                      icon="close"
+                      type="danger"
+                      title="Entfernen"
+                      @click="removeExposureContact(contact.id)"/>
+                  </div>
+                </template>
+              </a-table>
+            </a-card>
+          </a-row>
+          <a-modal title="Kontaktperson bearbeiten"
+            ref="exposureContactModal"
+            :visible="!!exposureContactInEditing"
+            @ok="persistExposureContact()
+              .then((success) => { if (success) exposureContactInEditing = null })"
+            @cancel="exposureContactInEditing = null">
+            <a-form :form="exposureContactForm" :selfUpdate="true">
+              <EditExposureContact
+                :disableOriginatorPatient="true"/>
+            </a-form>
+          </a-modal>
+        </a-tab-pane>
       </a-tabs>
     </div>
   </div>
@@ -245,9 +395,9 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import moment from 'moment'
+import moment, { Moment } from 'moment'
 import Api from '@/api'
-import { LabTest, Patient, Timestamp } from '@/api/SwaggerApi'
+import { LabTest, Patient, Timestamp, ExposureContactFromServer } from '@/api/SwaggerApi'
 import { patientMapper } from '@/store/modules/patients.module'
 import { EventTypeItem, eventTypes, testResults, TestResultType } from '@/models/event-types'
 import { SYMPTOMS } from '@/models/symptoms'
@@ -255,6 +405,8 @@ import { PRE_ILLNESSES } from '@/models/pre-illnesses'
 import { Column } from 'ant-design-vue/types/table/column'
 import { TestTypeItem, testTypes } from '@/models/test-types'
 import ChangePatientStammdatenForm from '@/components/ChangePatientStammdatenForm.vue'
+import EditExposureContact from '@/components/EditExposureContact.vue'
+import { map } from '@/util/mapping'
 
 const columnsTests: Partial<Column>[] = [
   {
@@ -289,8 +441,86 @@ const columnsTests: Partial<Column>[] = [
   },
 ]
 
+const columnsExposureContacts: Partial<Column>[] = [
+  {
+    key: 'gotoPatient',
+    width: '40pt',
+    align: 'center',
+    scopedSlots: {
+      customRender: 'gotoPatient',
+    },
+  },
+  {
+    title: 'Nachname',
+    key: 'lastName',
+    dataIndex: 'contact.lastName',
+  },
+  {
+    title: 'Vorname',
+    key: 'firstName',
+    dataIndex: 'contact.firstName',
+  },
+  {
+    title: 'Datum des Kontakts',
+    key: 'dateOfContact',
+    scopedSlots: {
+      customRender: 'dateOfContact',
+    },
+  },
+  {
+    title: 'Infektionsstatus',
+    key: 'infected',
+    scopedSlots: {
+      customRender: 'infectionState',
+    },
+  },
+  {
+    title: 'Quarantänestatus',
+    key: 'quarantine',
+    scopedSlots: {
+      customRender: 'quarantineState',
+    },
+  },
+  {
+    title: 'Aktionen',
+    key: 'actions',
+    width: '120pt',
+    align: 'center',
+    scopedSlots: {
+      customRender: 'actions',
+    },
+  },
+]
+
+const columnsIndexPatients = [
+  {
+    title: 'Name',
+    key: 'name',
+    scopedSlots: {
+      customRender: 'name',
+    },
+  },
+  {
+    title: 'Kontaktdatum',
+    key: 'dateOfContact',
+    scopedSlots: {
+      customRender: 'dateOfContact',
+    },
+  },
+  {
+    title: 'Wie?',
+    key: 'context',
+    dataIndex: 'context',
+  },
+]
+
 interface State {
   patient: undefined | Patient;
+  patientInfectionSources: ExposureContactFromServer[];
+  exposureContacts: ExposureContactFromServer[];
+  exposureContactsLoading: boolean;
+  exposureContactForm: any;
+  exposureContactInEditing: any;
   patientStatus: EventTypeItem | undefined;
   eventTypes: any[];
   symptoms: string[];
@@ -300,6 +530,8 @@ interface State {
   gender: string;
   tests: LabTest[];
   columnsTests: Partial<Column>[];
+  columnsExposureContacts: Partial<Column>[];
+  columnsIndexPatients: Partial<Column>[];
   testResults: TestResultType[];
   testTypes: TestTypeItem[];
   dateOfReporting: string;
@@ -311,6 +543,7 @@ export default Vue.extend({
   name: 'PatientDetails',
   components: {
     ChangePatientStammdatenForm,
+    EditExposureContact,
   },
   computed: {
     ...patientMapper.mapGetters({
@@ -320,12 +553,22 @@ export default Vue.extend({
 
   async created() {
     this.loadData()
+    this.exposureContactForm = this.$form.createForm(
+      this.$refs.exposureContactModal as Vue, {
+        name: 'exposure-contact',
+      },
+    )
   },
 
   data(): State {
     return {
       dateFormat: 'DD.MM.YYYY',
       patient: undefined,
+      patientInfectionSources: [],
+      exposureContacts: [],
+      exposureContactsLoading: false,
+      exposureContactForm: undefined,
+      exposureContactInEditing: null,
       patientStatus: undefined,
       eventTypes: eventTypes,
       testResults: testResults,
@@ -337,6 +580,8 @@ export default Vue.extend({
       gender: '',
       tests: [],
       columnsTests,
+      columnsExposureContacts,
+      columnsIndexPatients,
       dateOfReporting: '',
       dateOfIllness: '',
     }
@@ -353,6 +598,8 @@ export default Vue.extend({
       setPatient: 'setPatient',
     }),
     async loadData() {
+      this.exposureContactsLoading = true
+
       // Load Patient
       const patientId = this.$route.params.id
       this.patient = this.patientById(this.$route.params.id)
@@ -389,8 +636,19 @@ export default Vue.extend({
       const patientGender = this.patient.gender || ''
       this.gender = patientGender === 'male' ? 'männlich' : patientGender === 'female' ? 'weiblich' : 'divers'
 
+      // Source of Infection
+      try {
+        this.patientInfectionSources = await Api.getExposureSourceContactsForPatientUsingGet(patientId)
+      } catch (e) {
+        this.patientInfectionSources = []
+      }
+
       // Tests
       this.tests = await Api.getLabTestForPatientUsingGet(patientId)
+
+      // Retrieve exposure contacts data
+      this.exposureContacts = await Api.getExposureContactsForPatientUsingGet(patientId)
+      this.exposureContactsLoading = false
     },
     timelineColor(eventType: any) {
       switch (eventType) {
@@ -441,6 +699,65 @@ export default Vue.extend({
         })
       }
     },
+    addExposureContact() {
+      const patientId = this.patient?.id
+
+      this.exposureContactInEditing = {}
+
+      Vue.nextTick(() => {
+        this.exposureContactForm.resetFields()
+        this.exposureContactForm.setFieldsValue({
+          source: this.patient,
+        })
+      })
+    },
+    showExposureContact(contactId: number) {
+      const contact = this.exposureContacts.find((contact: any) => contact.id === contactId)
+
+      this.exposureContactInEditing = contact
+
+      Vue.nextTick(() => {
+        this.exposureContactForm.setFieldsValue(map(contact as {[x: string]: any}, {
+          // source: patient => patient.id,
+          // contact: patient => patient.id,
+          dateOfContact: moment,
+        }))
+      })
+    },
+    persistExposureContact(): Promise<boolean> {
+      const stringFromMoment = (value: Moment): string => value.format('YYYY-MM-DD')
+
+      return new Promise((resolve: (success: boolean) => void) => {
+        this.exposureContactForm.validateFields(async(err: Error[], values: {[x: string]: any}) => {
+          if (err) {
+            resolve(false)
+            return
+          }
+
+          // Convert values to transport format
+          values = map(values, {
+            id: parseInt,
+            dateOfContact: stringFromMoment,
+          })
+
+          if (values.id) {
+            Object.assign(this.exposureContactInEditing, await Api.updateExposureContactUsingPut(values))
+          } else {
+            this.exposureContacts.push(await Api.createExposureContactUsingPost(values))
+          }
+
+          resolve(true)
+        })
+      })
+    },
+    async removeExposureContact(contactId: number) {
+      await Api.removeExposureContactUsingDelete(contactId)
+      this.exposureContacts = this.exposureContacts.filter(contact => contact.id !== contactId)
+    },
+    showPatient(patientId: string) {
+      this.$router.push({ name: 'patient-detail', params: { id: patientId } })
+    },
+    moment,
     getDate(date: string) {
       return moment(date).format(this.dateFormat)
     },
@@ -452,7 +769,24 @@ export default Vue.extend({
 <style scoped lang="scss">
   table {
     border-collapse: separate;
-    border-spacing: 15px
+    border-spacing: 5px;
+
+    tr {
+      padding: 15px;
+
+      td:first-of-type {
+        padding-right: 15px;
+      }
+    }
+  }
+
+  table.compact {
+    border-spacing: 15px 3px;
+  }
+
+  .inline-buttons > button {
+    margin-left: 2px;
+    margin-right: 2px;
   }
 
   .card-header {
@@ -472,3 +806,18 @@ export default Vue.extend({
     color: rgba(0, 0, 0, 0.65);
   }
 </style>
+
+<style lang="scss">
+  .table-index-patients {
+    table {
+      width: unset;
+    }
+    .ant-table-tbody > tr > td {
+      border-bottom: none;
+      padding: 4px;
+    }
+  }
+  .ant-descriptions-item {
+    vertical-align: top;
+  }
+</style>
diff --git a/client/src/views/RegisterPatient.vue b/client/src/views/RegisterPatient.vue
index f3feb1b3..2f57f946 100644
--- a/client/src/views/RegisterPatient.vue
+++ b/client/src/views/RegisterPatient.vue
@@ -218,16 +218,20 @@
             <a-row>
               <a-col :span="1"></a-col>
               <a-col :span="8">
-                <DateInput :decorator="['dateOfIllness', { rules: [{
-                      required: true,
-                      message: 'Bitte Erkrankungsdatum wählen',
-                    }], initialValue: today}]" label="Erkrankungsdatum" />
+                <a-form-item label="Erkrankungsdatum">
+                  <DateInput v-decorator="['dateOfIllness', { rules: [{
+                        required: true,
+                        message: 'Bitte Erkrankungsdatum wählen',
+                      }], initialValue: today}]" />
+                </a-form-item>
               </a-col>
               <a-col :span="8">
-                <DateInput :decorator="['dateOfReporting', { rules: [{
-                      required: true,
-                      message: 'Bitte Meldedatum wählen'
-                    }], initialValue: today}]" label="Meldedatum" />
+                <a-form-item label="Meldedatum">
+                  <DateInput v-decorator="['dateOfReporting', { rules: [{
+                        required: true,
+                        message: 'Bitte Meldedatum wählen'
+                      }], initialValue: today}]" />
+                </a-form-item>
               </a-col>
             </a-row>
             <a-row>
diff --git a/client/src/views/RegisterTest.vue b/client/src/views/RegisterTest.vue
index 4bf55146..1ad87c15 100644
--- a/client/src/views/RegisterTest.vue
+++ b/client/src/views/RegisterTest.vue
@@ -17,14 +17,14 @@
         label="Labor"
       />
 
-      <PatientInput
-        :form="form"
-        :validation="['patientId',{ rules: [{
-          required: true,
-          message: 'Bitte geben Sie die Patienten-ID ein.'
-        }]}]"
-        label="Patienten-ID"
-      />
+      <a-form-item label="Patienten-ID">
+        <PatientInput
+          v-decorator="['patientId',{ rules: [{
+            required: true,
+            message: 'Bitte geben Sie die Patienten-ID ein.'
+          }]}]"
+        />
+      </a-form-item>
 
       <!-- Test ID -->
       <a-form-item label="Test-ID">
diff --git a/client/src/views/SendToQuarantine.vue b/client/src/views/SendToQuarantine.vue
index 7a72be33..29fe522c 100644
--- a/client/src/views/SendToQuarantine.vue
+++ b/client/src/views/SendToQuarantine.vue
@@ -7,24 +7,24 @@
       @submit.prevent="handleSubmit"
     > <!-- :colon="false" -->
 
-      <PatientInput
-        v-if="this.showPatientInput"
-        :form="form"
-        :validation="['patientId',{ rules: [{
-          required: true,
-          message: 'Bitte geben Sie die Patienten-ID ein.'
-        }]}]"
-        label="Patienten-ID"
-      />
+      <a-form-item label="Patienten-ID"
+        v-if="this.showPatientInput">
+        <PatientInput
+          v-decorator="['patientId',{ rules: [{
+            required: true,
+            message: 'Bitte geben Sie die Patienten-ID ein.'
+          }]}]"
+        />
+      </a-form-item>
 
-      <DateInput
-        :form="form"
-        :decorator="['dateUntil', { rules: [{
-          required: true,
-          message: 'Bis wann soll der Patient in Quarantäne?',
-        }]}]"
-        label="Quarantäne bis"
-      />
+      <a-form-item label="Quarantäne bis">
+        <DateInput
+          v-decorator="['dateUntil', { rules: [{
+            required: true,
+            message: 'Bis wann soll der Patient in Quarantäne?',
+          }]}]"
+        />
+      </a-form-item>
 
       <!-- Kommentar -->
       <a-form-item label="Kommentar">
diff --git a/client/yarn.lock b/client/yarn.lock
index 8e716e46..c166dfa1 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -9991,6 +9991,11 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
+vue-typed-mixins@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/vue-typed-mixins/-/vue-typed-mixins-0.2.0.tgz#d369c186a392780bbbe9f1b28a4cdcf62bec9053"
+  integrity sha512-0OxuinandPWv3nm5k/reYkuKtX3jjPZ40Sy9roJz0ih8PUzmI7zSRiXFEJ62LsyRegw9Tqy+qMkajk7ipKP8Vg==
+
 vue@^2.6.11:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
diff --git a/server/src/main/java/de/coronavirus/imis/api/ExposureContactController.java b/server/src/main/java/de/coronavirus/imis/api/ExposureContactController.java
new file mode 100644
index 00000000..9930e6ac
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/api/ExposureContactController.java
@@ -0,0 +1,72 @@
+package de.coronavirus.imis.api;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+import de.coronavirus.imis.api.dto.ExposureContactDTO;
+import de.coronavirus.imis.domain.ExposureContact;
+import de.coronavirus.imis.mapper.ExposureContactMapper;
+import de.coronavirus.imis.repositories.ExposureContactRepository;
+
+@RestController
+@RequestMapping("/api/exposure-contacts")
+@RequiredArgsConstructor
+public class ExposureContactController {
+  private final ExposureContactRepository exposureContactRepository;
+  private final ExposureContactMapper exposureContactMapper;
+
+  @PostMapping
+  public ExposureContactDTO.FromServer createExposureContact(@RequestBody ExposureContactDTO.ToServer dto) {
+    return exposureContactMapper.toExposureContactDTO(
+      exposureContactRepository.saveAndFlush(
+        exposureContactMapper.toExposureContact(dto)
+      )
+    );
+  }
+
+  @PutMapping
+  public ExposureContactDTO.FromServer updateExposureContact(@RequestBody ExposureContactDTO.ToServer contact) {
+    return exposureContactMapper.toExposureContactDTO(
+      exposureContactRepository.saveAndFlush(
+        exposureContactMapper.toExposureContact(contact)
+      )
+    );
+  }
+
+  @GetMapping("/{id}")
+  public ExposureContactDTO.FromServer getExposureContact(@PathVariable("id") long id) {
+    return exposureContactMapper.toExposureContactDTO(exposureContactRepository.findById(id).orElse(null));
+  }
+
+  @GetMapping("/by-source/{id}")
+  public List<ExposureContactDTO.FromServer> getExposureContactsForPatient(@PathVariable("id") String patientId) {
+    return exposureContactRepository.findBySourceId(patientId)
+      .stream().map(contact -> exposureContactMapper.toExposureContactDTO(contact))
+      .collect(Collectors.toList());
+  }
+  @GetMapping("/by-contact/{id}")
+  public List<ExposureContactDTO.FromServer> getExposureSourceContactsForPatient(@PathVariable("id") String patientId) {
+    return exposureContactRepository.findByContactId(patientId)
+      .stream().map(contact -> exposureContactMapper.toExposureContactDTO(contact))
+      .collect(Collectors.toList());
+  }
+
+  @DeleteMapping("/{id}")
+  public void removeExposureContact(@PathVariable("id") long id) {
+    this.exposureContactRepository.deleteById(id);
+  }
+}
diff --git a/server/src/main/java/de/coronavirus/imis/api/dto/ExposureContactDTO.java b/server/src/main/java/de/coronavirus/imis/api/dto/ExposureContactDTO.java
new file mode 100644
index 00000000..2f48c080
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/api/dto/ExposureContactDTO.java
@@ -0,0 +1,92 @@
+package de.coronavirus.imis.api.dto;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.StdConverter;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import de.coronavirus.imis.api.dto.CreatePatientDTO;
+import de.coronavirus.imis.domain.Patient;
+import de.coronavirus.imis.services.PatientService;
+
+@Component
+public abstract class ExposureContactDTO {
+  @Data
+  public static class Common {
+    private long id;
+    private String context;
+    private String dateOfContact;
+    private String comment;
+  }
+
+  @ApiModel("ExposureContactToServer")
+  @Data
+  public static class ToServer {
+    private String source;
+    @JsonDeserialize(converter = ExOrNewContactConverter.class)
+    private String contact;
+
+    @JsonUnwrapped
+    private ExposureContactDTO.Common common;
+  }
+
+  @ApiModel("ExposureContactFromServer")
+  @Data
+  public static class FromServer {
+    private ExposureContactDTO.ContactView source;
+    private ExposureContactDTO.ContactView contact;
+
+    @JsonUnwrapped
+    private ExposureContactDTO.Common common;
+  }
+
+  @ApiModel("ExposureContactContactView")
+  @Data
+  public static class ContactView {
+    private String id;
+    private String firstName;
+    private String lastName;
+    private boolean infected;
+    private boolean inQuarantine;
+  }
+
+
+  /**
+   * Allow exposure contacts to be specified either by ID to
+   * an existing patient, or data for a new Patient instance
+   */
+  @Component
+  public static class ExOrNewContactConverter
+    extends StdConverter<JsonNode, String> {
+
+    @Autowired
+    private PatientService patientService;
+
+    private ObjectMapper jsonMapper = new ObjectMapper();
+
+    public String convert(JsonNode in) {
+      if (in == null) {
+        return null;
+      } else if (in.isTextual()) {
+        return in.textValue();
+      } else {
+        try {
+          CreatePatientDTO newPatientDto = this.jsonMapper.treeToValue(in, CreatePatientDTO.class);
+          return this.patientService.addPatient(newPatientDto, true).getId();
+        } catch (JsonProcessingException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }
+  }
+}
diff --git a/server/src/main/java/de/coronavirus/imis/config/SpringSecurityConfig.java b/server/src/main/java/de/coronavirus/imis/config/SpringSecurityConfig.java
index 6b1f3408..39862e74 100644
--- a/server/src/main/java/de/coronavirus/imis/config/SpringSecurityConfig.java
+++ b/server/src/main/java/de/coronavirus/imis/config/SpringSecurityConfig.java
@@ -62,6 +62,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.antMatchers(OPTIONS, "/**").permitAll()
 				.antMatchers("/api/auth").permitAll()
 				.antMatchers(API_PREFIX + "/patients").hasAnyRole(DEPARTMENT_OF_HEALTH, CLINIC, DOCTORS_OFFICE, TEST_SITE)
+				.antMatchers(API_PREFIX + "/exposure-contacts/**").hasAnyRole(DEPARTMENT_OF_HEALTH, CLINIC, DOCTORS_OFFICE, TEST_SITE)
 				.antMatchers(API_PREFIX + "/doctor/*").hasAnyRole(DEPARTMENT_OF_HEALTH, DOCTORS_OFFICE, CLINIC)
 				.mvcMatchers(POST, API_PREFIX + "/labtest").hasAnyRole(DEPARTMENT_OF_HEALTH, DOCTORS_OFFICE, CLINIC, TEST_SITE)
 				.antMatchers(API_PREFIX + "/labtest/patient/*").hasAnyRole(DEPARTMENT_OF_HEALTH, DOCTORS_OFFICE, CLINIC, TEST_SITE)
diff --git a/server/src/main/java/de/coronavirus/imis/domain/ExposureContact.java b/server/src/main/java/de/coronavirus/imis/domain/ExposureContact.java
new file mode 100644
index 00000000..85ed06d9
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/domain/ExposureContact.java
@@ -0,0 +1,22 @@
+package de.coronavirus.imis.domain;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import de.coronavirus.imis.mapper.PatientMapper;
+import de.coronavirus.imis.repositories.PatientRepository;
+
+@Entity
+@Data
+@Accessors(chain = true)
+@DiscriminatorValue("person")
+public class ExposureContact extends InfectionSource {
+	@ManyToOne
+	private Patient source;
+	private String context;
+}
diff --git a/server/src/main/java/de/coronavirus/imis/domain/GenericInfectionSource.java b/server/src/main/java/de/coronavirus/imis/domain/GenericInfectionSource.java
new file mode 100644
index 00000000..e347b137
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/domain/GenericInfectionSource.java
@@ -0,0 +1,12 @@
+package de.coronavirus.imis.domain;
+
+import javax.persistence.*;
+
+import lombok.Data;
+
+@Entity
+@Data
+@DiscriminatorValue("generic")
+public class GenericInfectionSource extends InfectionSource {
+  private String description;
+}
diff --git a/server/src/main/java/de/coronavirus/imis/domain/InfectionSource.java b/server/src/main/java/de/coronavirus/imis/domain/InfectionSource.java
new file mode 100644
index 00000000..440b64b3
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/domain/InfectionSource.java
@@ -0,0 +1,35 @@
+package de.coronavirus.imis.domain;
+
+import java.time.LocalDate;
+
+import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import static com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Inheritance(strategy = InheritanceType.JOINED)
+@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING)
+@JsonTypeInfo(
+  use = JsonTypeInfo.Id.NAME,
+  property = "type",
+  include = JsonTypeInfo.As.PROPERTY
+)
+@JsonSubTypes({
+  @Type(name = "generic", value = GenericInfectionSource.class),
+  @Type(name = "person", value = ExposureContact.class)
+})
+public abstract class InfectionSource {
+  @Id
+  @GeneratedValue
+  private long id;
+
+  @ManyToOne
+  private Patient contact;
+  private LocalDate dateOfContact;
+  private String comment;
+}
diff --git a/server/src/main/java/de/coronavirus/imis/domain/Patient.java b/server/src/main/java/de/coronavirus/imis/domain/Patient.java
index a8c2e69d..7e67fca2 100644
--- a/server/src/main/java/de/coronavirus/imis/domain/Patient.java
+++ b/server/src/main/java/de/coronavirus/imis/domain/Patient.java
@@ -1,10 +1,15 @@
 package de.coronavirus.imis.domain;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import io.swagger.annotations.ApiModel;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
@@ -12,8 +17,12 @@
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.util.Collections;
 import java.util.List;
 
+import de.coronavirus.imis.domain.ExposureContact;
+import de.coronavirus.imis.repositories.ExposureContactRepository;
+
 
 @Entity
 @Getter
@@ -61,6 +70,14 @@ public class Patient {
 	@Convert(converter = StringListConverter.class)
 	private List<String> symptoms;
 	private Boolean coronaContacts;
+
+	@JsonIgnore
+	@OneToMany(mappedBy = "contact")
+	private List<InfectionSource> infectionSource;
+	@JsonIgnore
+	@OneToMany(mappedBy = "source")
+	private List<ExposureContact> exposureContacts;
+
 	@Convert(converter = StringListConverter.class)
 	private List<String> riskAreas;
 	private Boolean weakenedImmuneSystem;
@@ -77,4 +94,13 @@ public class Patient {
 	private Boolean onIntensiveCareUnit;
 
 	private LocalDate quarantineUntil;
+
+	@ApiModel("PatientIdentity")
+	@Getter
+	@Setter
+	public static class IdentityView {
+		private String id;
+		private String firstName;
+		private String lastName;
+	}
 }
diff --git a/server/src/main/java/de/coronavirus/imis/domain/StringListConverter.java b/server/src/main/java/de/coronavirus/imis/domain/StringListConverter.java
index 28d82fef..aa7da6e6 100644
--- a/server/src/main/java/de/coronavirus/imis/domain/StringListConverter.java
+++ b/server/src/main/java/de/coronavirus/imis/domain/StringListConverter.java
@@ -11,11 +11,11 @@ public class StringListConverter implements AttributeConverter<List<String>, Str
 
 	@Override
 	public String convertToDatabaseColumn(List<String> stringList) {
-		return String.join(SPLIT_CHAR, stringList);
+		return stringList != null ? String.join(SPLIT_CHAR, stringList) : null;
 	}
 
 	@Override
 	public List<String> convertToEntityAttribute(String string) {
-		return Arrays.asList(string.split(SPLIT_CHAR));
+		return string != null ? Arrays.asList(string.split(SPLIT_CHAR)) : null;
 	}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/de/coronavirus/imis/mapper/ExposureContactMapper.java b/server/src/main/java/de/coronavirus/imis/mapper/ExposureContactMapper.java
new file mode 100644
index 00000000..a50a8e70
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/mapper/ExposureContactMapper.java
@@ -0,0 +1,39 @@
+package de.coronavirus.imis.mapper;
+
+import java.time.LocalDate;
+
+import de.coronavirus.imis.api.dto.ExposureContactDTO;
+import de.coronavirus.imis.domain.EventType;
+import de.coronavirus.imis.domain.ExposureContact;
+import de.coronavirus.imis.domain.Patient;
+import de.coronavirus.imis.mapper.PatientMapper;
+import de.coronavirus.imis.repositories.PatientRepository;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Mapper(imports = {
+  EventType.class,
+  LocalDate.class
+})
+public abstract class ExposureContactMapper {
+
+  @Autowired
+  protected PatientRepository patientRepo;
+
+  @Mapping(target = "id", source = "common.id")
+  @Mapping(target = "source", expression = "java( patientRepo.findById(dto.getSource()).orElse(null) )")
+  @Mapping(target = "contact", expression = "java( patientRepo.findById(dto.getContact()).orElse(null) )")
+  @Mapping(target = "context", source = "common.context")
+  @Mapping(target = "dateOfContact", source = "common.dateOfContact")
+  @Mapping(target = "comment", source = "common.comment")
+  public abstract ExposureContact toExposureContact(ExposureContactDTO.ToServer dto);
+
+  @Mapping(target = "common", source = ".")
+  public abstract ExposureContactDTO.FromServer toExposureContactDTO(ExposureContact contact);
+
+  @Mapping(target = "infected", expression = "java( patient.getPatientStatus() == EventType.TEST_FINISHED_POSITIVE )")
+  @Mapping(target = "inQuarantine", expression = "java( patient.getQuarantineUntil() != null && patient.getQuarantineUntil().isAfter(LocalDate.now()) )")
+  public abstract ExposureContactDTO.ContactView toContactView(Patient patient);
+}
diff --git a/server/src/main/java/de/coronavirus/imis/mapper/PatientMapper.java b/server/src/main/java/de/coronavirus/imis/mapper/PatientMapper.java
index 67a1b926..593287ee 100644
--- a/server/src/main/java/de/coronavirus/imis/mapper/PatientMapper.java
+++ b/server/src/main/java/de/coronavirus/imis/mapper/PatientMapper.java
@@ -2,8 +2,10 @@
 
 import de.coronavirus.imis.api.dto.CreatePatientDTO;
 import de.coronavirus.imis.domain.Patient;
+import de.coronavirus.imis.repositories.PatientRepository;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -15,6 +17,9 @@ public abstract class PatientMapper {
 	public static final String DATE_FORMAT = "yyyy-MM-dd";
 	public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT);
 
+	@Autowired
+	private PatientRepository patientRepository;
+
 	@Mapping(target = "patientStatus", defaultValue = "REGISTERED")
 	@Mapping(target = "creationTimestamp", expression = "java( OffsetDateTime.now() )")
 	@Mapping(target = "dateOfBirth", dateFormat = DATE_FORMAT)
@@ -26,6 +31,12 @@ public abstract class PatientMapper {
 	@Mapping(target = "events", ignore = true)
 	public abstract Patient toPatient(CreatePatientDTO createPatient);
 
+	public Patient toPatient(String id) {
+		return id != null ? patientRepository.findById(id).orElse(null) : null;
+	}
+
+	public abstract Patient.IdentityView toIdentityView(Patient patient);
+
 	public LocalDate parseDate(String localDateString) {
 		LocalDate localDate = null;
 		if (localDateString != null && !localDateString.isBlank()) {
diff --git a/server/src/main/java/de/coronavirus/imis/repositories/ExposureContactRepository.java b/server/src/main/java/de/coronavirus/imis/repositories/ExposureContactRepository.java
new file mode 100644
index 00000000..479463b8
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/repositories/ExposureContactRepository.java
@@ -0,0 +1,16 @@
+package de.coronavirus.imis.repositories;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+import de.coronavirus.imis.domain.ExposureContact;
+
+public interface ExposureContactRepository extends JpaRepository<ExposureContact, Long> {
+
+	List<ExposureContact> findBySourceId(String patientId);
+	List<ExposureContact> findByContactId(String patientId);
+}