diff --git a/client/src/api/Api.js b/client/src/api/Api.js
index 1e9bdca9..bbc65b29 100644
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -1,3 +1,10 @@
+const METHOD = {
+  GET: "GET",
+  POST: "POST",
+  PUT: "PUT",
+  DELETE: "DELETE"
+};
+
 class Api {
   constructor() {
     if (
@@ -10,50 +17,28 @@ class Api {
     }
   }
 
-  getCall(url) {
-    return fetch(encodeURI(`${this.BASE_URL}/${url}`), {
-      method: "GET",
+  executeRequest(url, method, body) {
+    const options = {
+      method: method,
       headers: {
         "Content-Type": "application/json"
       }
-    }).then(response => {
-      return response.json();
-    });
-  }
+    };
 
-  postCall(url, body) {
-    return fetch(encodeURI(`${this.BASE_URL}/${url}`), {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body)
-    }).then(response => {
-      return response.json();
-    });
-  }
-
-  putCall(url, body) {
-    return fetch(encodeURI(`${this.BASE_URL}/${url}`), {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body)
-    }).then(response => {
-      return response.json();
-    });
-  }
+    if (body) {
+      options.body = JSON.stringify(body);
+    }
 
-  deleteCall(url) {
-    return fetch(encodeURI(`${this.BASE_URL}/${url}`), {
-      method: "DELETE",
-      headers: {
-        "Content-Type": "application/json"
+    return fetch(encodeURI(`${this.BASE_URL}/${url}`), options).then(
+      response => {
+        if (response.ok) {
+          return response.json();
+        } else {
+          console.error(response);
+          throw new Error(`An error occured: Status ${response.status}`);
+        }
       }
-    }).then(response => {
-      return response.json();
-    });
+    );
   }
 
   /*
@@ -61,7 +46,7 @@ class Api {
    */
 
   postDoctorCreateAppointment({ doctorId, laboratoryId, patientId }) {
-    return this.postCall("/doctor/create_appointment", {
+    return this.executeRequest("/doctor/create_appointment", METHOD.POST, {
       doctorId,
       laboratoryId,
       patientId
@@ -69,50 +54,51 @@ class Api {
   }
 
   getTestReports(testId) {
-    return this.getCall(`/test_report/${testId}`);
+    return this.executeRequest(`/test_report/${testId}`, METHOD.GET);
   }
 
   // TODO: postTestReport, putTestReport | how to handle multipart/form-data in fetch ?!
 
   getTestReport(testId) {
-    return this.getCall(`/test_report/${testId}`);
+    return this.executeRequest(`/test_report/${testId}`, METHOD.GET);
   }
 
   deleteTestReport(testId) {
-    return this.deleteCall(`/test_report/${testId}`);
+    return this.executeRequest(`/test_report/${testId}`, METHOD.DELETE);
   }
 
   postInstitution(institution) {
-    return this.postCall("/institutions", institution);
+    return this.executeRequest("/institutions", METHOD.POST, institution);
   }
 
   postLabtest(labtest) {
-    return this.postCall("/labtest", labtest);
+    return this.executeRequest("/labtest", METHOD.POST, labtest);
   }
 
   putLabtest({ updatedTestStatus }) {
-    return this.postCall("/labtest", updatedTestStatus);
+    return this.executeRequest("/labtest", METHOD.PUT, updatedTestStatus);
   }
 
   getLabtestByPatient(patientId) {
-    return this.getCall(`/labtest/patient/${patientId}`);
+    return this.executeRequest(`/labtest/patient/${patientId}`, METHOD.GET);
   }
 
   getPatients() {
-    return this.getCall("/patients");
+    return this.executeRequest("/patients", METHOD.GET);
   }
 
   postPatient(patient) {
-    return this.postCall("/patients", patient);
+    return this.executeRequest("/patients", METHOD.POST, patient);
   }
 
   getPatient(id) {
-    return this.getCall(`/patients/${id}`);
+    return this.executeRequest(`/patients/${id}`, METHOD.GET);
   }
 
   getStats(lowerBoundsZip, upperBoundsZip) {
-    return this.getCall(
-      `/stats?lowerBoundsZip=${lowerBoundsZip}&upperBoundsZips=${upperBoundsZip}`
+    return this.executeRequest(
+      `/stats?lowerBoundsZip=${lowerBoundsZip}&upperBoundsZips=${upperBoundsZip}`,
+      METHOD.GET
     );
   }
 }
diff --git a/client/src/components/laboratory/Login.vue b/client/src/components/laboratory/Login.vue
index 4ee98845..fb0953a2 100644
--- a/client/src/components/laboratory/Login.vue
+++ b/client/src/components/laboratory/Login.vue
@@ -1,11 +1,11 @@
 <template>
   <a-card style="width: 500px; margin: 2rem auto; min-height: 300px">
-    <a-form :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
+    <a-form :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" :form="form">
       <p>{{ title }}</p>
       <a-form-item label="Kennung">
         <a-input
           v-decorator="[
-            'note',
+            'id',
             {
               rules: [
                 {
@@ -21,7 +21,7 @@
       <a-form-item label="Passwort">
         <a-input
           v-decorator="[
-            'note',
+            'password',
             {
               rules: [
                 {
@@ -32,6 +32,7 @@
             }
           ]"
           type="password"
+          placeholder="**********"
         />
       </a-form-item>
       <a-divider />
@@ -41,6 +42,10 @@
         </a-button>
       </a-form-item>
     </a-form>
+    <p class="test-acess">
+      Testzugang: Kennung <i><b>1234</b></i
+      >, Password <i><b>asdf</b></i>
+    </p>
   </a-card>
 </template>
 
@@ -52,17 +57,36 @@ export default {
   props: {
     title: String
   },
+  data() {
+    return {
+      form: this.$form.createForm(this)
+    };
+  },
   methods: {
     handleLogin(e) {
       e.preventDefault();
 
-      // TODO: Send login request
-      console.log("Handle login.");
+      this.form.validateFields((err, values) => {
+        if (err) {
+          return;
+        }
 
-      this.$emit("on-login-success");
+        if (values.id === "1234" && values.password === "asdf") {
+          this.$emit("on-login-success");
+        } else {
+          this.$notification["error"]({
+            message: "Login Fehler",
+            description: "Kennung und / oder Password nicht korrekt."
+          });
+        }
+      });
     }
   }
 };
 </script>
 
-<style></style>
+<style scoped>
+.test-acess {
+  color: red;
+}
+</style>
diff --git a/client/src/components/page/LinkSampleAndPatientPage.vue b/client/src/components/page/LinkSampleAndPatientPage.vue
index c1f3979c..b955e8a4 100644
--- a/client/src/components/page/LinkSampleAndPatientPage.vue
+++ b/client/src/components/page/LinkSampleAndPatientPage.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-tabs defaultActiveKey="1" v-model="activeKey">
-      <a-tab-pane tab="1. Laboranmeldung" key="1">
+      <a-tab-pane tab="1. Laboranmeldung" key="1" :disabled="isLoggedIn">
         <Login
           @on-login-success="onLoginSuccess"
           :title="
diff --git a/client/src/components/page/LinkTestResultAndPatientPage.vue b/client/src/components/page/LinkTestResultAndPatientPage.vue
index 5504fd2c..b1030d37 100644
--- a/client/src/components/page/LinkTestResultAndPatientPage.vue
+++ b/client/src/components/page/LinkTestResultAndPatientPage.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-tabs defaultActiveKey="1" v-model="activeKey">
-      <a-tab-pane tab="1. Laboranmeldung" key="1">
+      <a-tab-pane tab="1. Laboranmeldung" key="1" :disabled="isLoggedIn">
         <Login
           @on-login-success="onLoginSuccess"
           :title="
diff --git a/client/src/components/page/RegisterInstitutionPage.vue b/client/src/components/page/RegisterInstitutionPage.vue
index 550ad9a5..e73b3e4f 100644
--- a/client/src/components/page/RegisterInstitutionPage.vue
+++ b/client/src/components/page/RegisterInstitutionPage.vue
@@ -1,80 +1,118 @@
 <template>
-  <div>
-    <div>
-      Registrieren Sie hier Ihre eigene Instutition in IMIS.
-    </div>
-
-    <a-form
-      :form="form"
-      :label-col="{ span: 5 }"
-      :wrapper-col="{ span: 12 }"
-      @submit="handleSubmit"
-    >
-      <a-form-item label="Typ">
-        <a-select
-          v-decorator="[
-            'institutionType',
-            {
-              rules: [
-                {
-                  required: true,
-                  message: 'Please select your institution type!'
-                }
-              ]
-            }
-          ]"
-          placeholder="Bitte wählen..."
+  <div class="wrapper">
+    <div v-if="!createdInstitution">
+      <h3>
+        Registrieren Sie hier eine neue Instutition in IMIS.
+      </h3>
+      <a-card>
+        <a-form
+          :form="form"
+          :layout="'horizontal'"
+          :labelCol="{ span: 6 }"
+          :wrapperCol="{ span: 14, offset: 2 }"
+          @submit="handleSubmit"
         >
-          <a-select-option value="LABORATORY">Labor</a-select-option>
-          <a-select-option value="DOCTORS_OFFICE">Arztpraxis</a-select-option>
-          <a-select-option value="CLINIC">Klinik</a-select-option>
-          <a-select-option value="TEST_SITE">Teststelle</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item label="Name">
-        <a-input v-decorator="['name', { rules: [{ required: true }] }]" />
-      </a-form-item>
-      <a-form-item label="Straße">
-        <a-input v-decorator="['street', { rules: [{ required: true }] }]" />
-      </a-form-item>
-      <a-form-item label="Hausnr.">
-        <a-input
-          v-decorator="['houseNumber', { rules: [{ required: true }] }]"
-        />
-      </a-form-item>
-      <a-form-item label="PLZ">
-        <a-input v-decorator="['zip', { rules: [{ required: true }] }]" />
-      </a-form-item>
-      <a-form-item label="Ort">
-        <a-input v-decorator="['city', { rules: [{ required: true }] }]" />
-      </a-form-item>
-      <a-form-item label="E-mail">
-        <a-input v-decorator="['email', { rules: [{ required: true }] }]" />
-      </a-form-item>
-      <a-form-item label="Telefon">
-        <a-input
-          v-decorator="['phoneNumber', { rules: [{ required: true }] }]"
-        />
-      </a-form-item>
-      <a-form-item label="Anmerkungen">
-        <a-input v-decorator="['comment']" />
-      </a-form-item>
+          <a-row>
+            <a-col :md="12">
+              <a-form-item label="Typ">
+                <a-select
+                  v-decorator="[
+                    'institutionType',
+                    {
+                      rules: [
+                        {
+                          required: true,
+                          message: 'Please select your institution type!'
+                        }
+                      ]
+                    }
+                  ]"
+                  placeholder="Bitte wählen..."
+                >
+                  <a-select-option value="LABORATORY">Labor</a-select-option>
+                  <a-select-option value="DOCTORS_OFFICE"
+                    >Arztpraxis</a-select-option
+                  >
+                  <a-select-option value="CLINIC">Klinik</a-select-option>
+                  <a-select-option value="TEST_SITE"
+                    >Teststelle</a-select-option
+                  >
+                </a-select>
+              </a-form-item>
+              <a-form-item label="Name">
+                <a-input
+                  v-decorator="['name', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+              <a-form-item label="Straße">
+                <a-input
+                  v-decorator="['street', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+              <a-form-item label="Hausnr.">
+                <a-input
+                  v-decorator="['houseNumber', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12">
+              <a-form-item label="PLZ">
+                <a-input
+                  v-decorator="['zip', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+              <a-form-item label="Ort">
+                <a-input
+                  v-decorator="['city', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+              <a-form-item label="E-mail">
+                <a-input
+                  v-decorator="['email', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+              <a-form-item label="Telefon">
+                <a-input
+                  v-decorator="['phoneNumber', { rules: [{ required: true }] }]"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-form-item
+            label="Anmerkungen"
+            :labelCol="{ span: 5, pull: 2 }"
+            :wrapperCol="{ span: 19, pull: 1 }"
+          >
+            <a-input v-decorator="['comment']" />
+          </a-form-item>
+          <!-- Datenschutzerklärung Bestätigung-->
+          <a-form-item>
+            <a-checkbox @change="onCheck">
+              <span :class="dataProcessingClass">
+                Ich erkläre mich mit der Übermittlung dieser Daten zur weiteren
+                Verarbeitung einverstanden.
+              </span>
+            </a-checkbox>
+          </a-form-item>
 
-      <!-- Datenschutzerklärung Bestätigung-->
-      <a-form-item>
-        <a-checkbox @change="onCheck"
-          >Ich erkläre mich mit der Übermittlung dieser Daten zur weiteren
-          Verarbeitung einverstanden.</a-checkbox
-        >
-      </a-form-item>
-
-      <!-- Submit Button -->
-      <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-        <a-button type="primary" html-type="submit">
-          Registrieren
-        </a-button>
-      </a-form-item>
-    </a-form>
+          <!-- Submit Button -->
+          <a-form-item :wrapperCol="{ span: 24, offset: 0 }">
+            <a-row :gutter="16" type="flex" justify="end">
+              <a-col>
+                <a-button type="primary" html-type="submit">
+                  Registrieren
+                </a-button>
+              </a-col>
+            </a-row>
+          </a-form-item>
+        </a-form>
+      </a-card>
+    </div>
+    <div v-else>
+      <div>Die Institution wurde erfolgreich registriert.</div>
+      <br />
+      <div>Die Instituions ID lautet: {{ createdInstitution.id }}</div>
+    </div>
   </div>
 </template>
 
@@ -86,7 +124,9 @@ export default {
   name: "RegisterInstitutionPage",
   data() {
     return {
-      form: this.$form.createForm(this, { name: "coordinated" })
+      form: this.$form.createForm(this, { name: "coordinated" }),
+      createdInstitution: null,
+      dataProcessingClass: ""
     };
   },
   methods: {
@@ -97,6 +137,13 @@ export default {
       e.preventDefault();
 
       this.form.validateFields((err, values) => {
+        if (!this.checked) {
+          this.dataProcessingClass = "data-processing-not-selected";
+          return;
+        } else if (err) {
+          return;
+        }
+
         // TODO: Remove this when we go to production
         randomizeProperties(
           [
@@ -105,7 +152,7 @@ export default {
             "phoneNumber",
             "street",
             "houseNumber",
-            "zip",
+            { key: "zip", type: "number" },
             "city"
           ],
           values
@@ -113,10 +160,22 @@ export default {
 
         if (this.checked === true) {
           Api.postInstitution(values)
-            .then(() => {
-              this.$message.info("Created your Institution!");
+            .then(institution => {
+              this.createdInstitution = institution;
+
+              const notification = {
+                message: "Institution registriert.",
+                description: "Die Institution wurde erfolgreich registriert."
+              };
+              this.$notification["success"](notification);
             })
-            .catch(err => this.$message.info(err));
+            .catch(err => {
+              const notification = {
+                message: "Fehler beim Registrieren der Institution.",
+                description: err.message
+              };
+              this.$notification["error"](notification);
+            });
         }
       });
     }
@@ -124,4 +183,13 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.wrapper {
+  text-align: left;
+  padding: 24px;
+  width: 100%;
+}
+.data-processing-not-selected {
+  color: red;
+}
+</style>
diff --git a/client/src/components/page/RegisterPatientPage.vue b/client/src/components/page/RegisterPatientPage.vue
index 76def00b..a2c98f4f 100644
--- a/client/src/components/page/RegisterPatientPage.vue
+++ b/client/src/components/page/RegisterPatientPage.vue
@@ -1,12 +1,10 @@
 <template>
   <div class="wrapper">
-    <div v-if="!response">
-      <div>
-        <h3 :wrapperCol="{ span: 22, offset: 2 }">
-          Nehmen Sie hier neue Patienten auf. Bitte füllen Sie den Bogen
-          vollständig aus. <br />
-        </h3>
-      </div>
+    <div v-if="!createdPatient">
+      <h3>
+        Registrieren Sie hier neue Patienten in IMIS. Bitte füllen Sie den Bogen
+        vollständig aus.
+      </h3>
 
       <a-form
         :form="form"
@@ -216,33 +214,20 @@
         <!-- Datenschutzerklärung Bestätigung-->
         <br />
         <a-form-item :wrapperCol="{ span: 24, offset: 0 }">
-          <a-checkbox @change="onCheck"
-            >Datenschutzerklärung gelesen und verstanden</a-checkbox
-          >
+          <a-checkbox @change="onCheck">
+            <span :class="dataProcessingClass">
+              Ich erkläre mich mit der Übermittlung dieser Daten zur weiteren
+              Verarbeitung einverstanden.
+            </span>
+          </a-checkbox>
         </a-form-item>
 
         <!-- Submit Button -->
         <a-form-item :wrapperCol="{ span: 24, offset: 0 }">
           <a-row :gutter="16" type="flex" justify="end">
             <a-col>
-              <a-button type="default" html-type="submit">
-                Nichts Anordnen (nur Anlegen)
-              </a-button>
-            </a-col>
-            <a-col>
-              <a-button type="default" html-type="submit">
-                <!-- Platzhalter-->
-                Quarantäne Anordnen
-              </a-button>
-            </a-col>
-            <a-col>
-              <a-button
-                type="primary"
-                html-type="submit"
-                @click="handleTestQuarantineSubmit('success')"
-              >
-                <!-- Platzhalter-->
-                Test + Quarantäne Anordnen
+              <a-button type="primary" html-type="submit">
+                Patient registrieren + Test anordnen
               </a-button>
             </a-col>
           </a-row>
@@ -252,7 +237,7 @@
     <div v-else>
       <div>Der Patient wurde erfolgreich registriert.</div>
       <br />
-      <div>Die Patienten Id lautet: {{ response.id }}</div>
+      <div>Die Patienten ID lautet: {{ createdPatient.id }}</div>
     </div>
   </div>
 </template>
@@ -261,6 +246,7 @@
 
 <script>
 import { randomizeProperties } from "../../util/randomize";
+import Api from "../../api/Api";
 
 const SYMPTOMS = [
   { key: "SORE_THROAT", description: "Halsschmerzen" },
@@ -343,44 +329,22 @@ export default {
       selectedPreIllnesses,
       RISK_AREAS,
       selectedRiskAreas,
-      response: null
+      createdPatient: null,
+      dataProcessingClass: ""
     };
   },
   methods: {
     onCheck(e) {
       this.checked = e.target.checked;
     },
-    handleTestQuarantineSubmit(type) {
-      const patID = "12389384";
-
-      // Check notification type (success, info, warning, error)
-      if (type === "success") {
-        var notification = {
-          message: "Test & Quarantäne wurde erfolgreich angeordnet.",
-          description: `Patienten ID: ${patID}`
-        };
-      }
-
-      // Show notification
-      this.$notification[type](notification);
-    },
     handleSubmit(e) {
       e.preventDefault();
 
-      const symptoms = SYMPTOMS.filter(
-        symptom => this.selectedSymptoms[symptom.key]
-      ).map(symptom => symptom.key);
-      const preIllnesses = ILLNESSES.filter(
-        illness => this.selectedPreIllnesses[illness.key]
-      ).map(illness => illness.key);
-      const riskAreas = RISK_AREAS.filter(
-        riskArea => this.selectedRiskAreas[riskArea.key]
-      ).map(riskArea => riskArea.key);
-
       this.form.validateFields((err, values) => {
         if (!this.checked) {
-          // TODO: Show user that this has to be accepted
-          console.error("Must accept.");
+          this.dataProcessingClass = "data-processing-not-selected";
+          return;
+        } else if (err) {
           return;
         }
 
@@ -393,37 +357,49 @@ export default {
             "phoneNumber",
             "street",
             "houseNumber",
-            "zip",
             "city",
+            { key: "zip", type: "number" },
             "insuranceCompany",
             "insuranceMembershipNumber"
           ],
           values
         );
 
-        if (!err) {
-          const request = {
-            ...values,
-            dateOfBirth: values["dateOfBirth"].format("YYYY-MM-DD") + " 00",
-            symptoms,
-            preIllnesses,
-            riskAreas
-          };
+        const symptoms = SYMPTOMS.filter(
+          symptom => this.selectedSymptoms[symptom.key]
+        ).map(symptom => symptom.key);
+        const preIllnesses = ILLNESSES.filter(
+          illness => this.selectedPreIllnesses[illness.key]
+        ).map(illness => illness.key);
+        const riskAreas = RISK_AREAS.filter(
+          riskArea => this.selectedRiskAreas[riskArea.key]
+        ).map(riskArea => riskArea.key);
 
-          console.log(request);
+        const request = {
+          ...values,
+          dateOfBirth: values["dateOfBirth"].format("YYYY-MM-DD") + " 00",
+          symptoms,
+          preIllnesses,
+          riskAreas
+        };
 
-          fetch("/patients", {
-            method: "POST",
-            body: JSON.stringify(request),
-            headers: {
-              "Content-Type": "application/json"
-            }
+        Api.postPatient(request)
+          .then(response => {
+            this.createdPatient = response;
+
+            const notification = {
+              message: "Patient registriert.",
+              description: "Der Patient wurde erfolgreich registriert."
+            };
+            this.$notification["success"](notification);
           })
-            .then(response => response.json())
-            .then(data => {
-              this.response = data;
-            });
-        }
+          .catch(err => {
+            const notification = {
+              message: "Fehler beim Registrieren des Patienten.",
+              description: err.message
+            };
+            this.$notification["error"](notification);
+          });
       });
     }
   }
@@ -436,33 +412,7 @@ export default {
   padding: 24px;
   width: 100%;
 }
-
-.form-container {
-  -webkit-animation: fadeOutUp 4s ease;
-  animation: fadeOutUp 4s ease;
-}
-
-@-webkit-keyframes fadeOutUp {
-  from {
-    opacity: 1;
-  }
-
-  to {
-    opacity: 0;
-    -webkit-transform: translate3d(0, -100%, 0);
-    transform: translate3d(0, -100%, 0);
-  }
-}
-
-@keyframes fadeOutUp {
-  from {
-    opacity: 1;
-  }
-
-  to {
-    opacity: 0;
-    -webkit-transform: translate3d(0, -100%, 0);
-    transform: translate3d(0, -100%, 0);
-  }
+.data-processing-not-selected {
+  color: red;
 }
 </style>
diff --git a/client/src/util/randomize.js b/client/src/util/randomize.js
index 2747adf3..9c03d637 100644
--- a/client/src/util/randomize.js
+++ b/client/src/util/randomize.js
@@ -1,11 +1,15 @@
 export const randomizeProperties = (keys, object) => {
   keys.forEach(key => {
-    object[key] =
-      Math.random()
-        .toString(36)
-        .substring(2, 15) +
-      Math.random()
-        .toString(36)
-        .substring(2, 15);
+    if (typeof key === "string") {
+      object[key] =
+        Math.random()
+          .toString(36)
+          .substring(2, 15) +
+        Math.random()
+          .toString(36)
+          .substring(2, 15);
+    } else if (typeof key === "object" && key.type === "number") {
+      object[key.key] = Math.round((Math.random() + 0.1) * 10000);
+    }
   });
 };