diff --git a/config/config.json b/config/config.json
index 20f591f..3274875 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,9 +1,9 @@
 {
   "development": {
-    "username": "miriam_user",
+    "username": "miriamgemeinde",
     "password": "hitomisan",
     "database": "miriamgemeinde",
-    "host": "tsschulz.de",
+    "host": "localhost",
     "dialect": "mysql"
   },
   "test": {
diff --git a/config/database.js b/config/database.js
index 9ba8592..cd914c2 100644
--- a/config/database.js
+++ b/config/database.js
@@ -1,7 +1,7 @@
 const { Sequelize } = require('sequelize');
 
-const sequelize = new Sequelize('miriamgemeinde', 'miriam_user', 'hitomisan', {
-  host: 'tsschulz.de',
+const sequelize = new Sequelize('miriamgemeinde', 'miriamgemeinde', 'hitomisan', {
+  host: 'localhost',
   dialect: 'mysql',
   retry: {
     match: [
diff --git a/src/components/WorshipRender.vue b/src/components/WorshipRender.vue
index b0a99a9..6177d43 100644
--- a/src/components/WorshipRender.vue
+++ b/src/components/WorshipRender.vue
@@ -11,22 +11,35 @@
                     <div v-if="worship.neighborInvitation" class="neighborhood-invitation">Einladung zum Gottesdienst im
                         Nachbarschaftsraum:</div>
                     <h3>
-                        <span :class="worship.highlightTime ? 'highlight-time' : ''">{{ formatTime(worship.time)
-                            }}</span>&nbsp;-&nbsp;
-                        {{ worship.title ? worship.title : `Gottesdienst in ${worship.eventPlace.name}` }}
+                        <span
+                          :class="worship.highlightTime ? 'highlight-time' : ''"
+                        >{{ formatTime(worship.time) }}</span>&nbsp;-&nbsp;
+                        {{
+                          worship.title
+                            ? worship.title
+                            : (worship.eventPlace && worship.eventPlace.name
+                                ? `Gottesdienst in ${worship.eventPlace.name}`
+                                : 'Gottesdienst')
+                        }}
                     </h3>
                     <div v-if="worship.organizer">Gestaltung: {{ worship.organizer }}</div>
                     <div v-if="worship.sacristanService" class="internal-information">Küsterdienst: {{ worship.sacristanService }}</div>
                     <div v-if="worship.collection">Kollekte: {{ worship.collection }}</div>
                     <div v-if="worship.organPlaying" class="internal-information">Orgelspiel: {{ worship.organPlaying }}</div>
                     <div v-if="worship.address">{{ worship.address }}</div>
-                    <div v-if="!worship.address && worship.eventPlace.id && worship.eventPlace.id">
-                        Adresse: {{ worship.eventPlace.name }}, {{ worship.eventPlace.street }}, {{
-                        worship.eventPlace.city }}
+                    <div
+                      v-if="!worship.address && worship.eventPlace && worship.eventPlace.id"
+                    >
+                        Adresse: {{ worship.eventPlace.name }}, {{ worship.eventPlace.street }}, {{ worship.eventPlace.city }}
                     </div>
-                    <div v-if="worship.selfInformation" class="selfinformation">Bitte informieren Sie sich auch auf den
-                        <a v-if="worship.eventPlace.website" :href="worship.eventPlace.website" target="_blank">Internetseiten dieser Gemeinde!</a><span
-                            v-else>Internetseiten dieser Gemeinde!</span>
+                    <div v-if="worship.selfInformation" class="selfinformation">
+                        Bitte informieren Sie sich auch auf den
+                        <a
+                          v-if="worship.eventPlace && worship.eventPlace.website"
+                          :href="worship.eventPlace.website"
+                          target="_blank"
+                        >Internetseiten dieser Gemeinde!</a>
+                        <span v-else>Internetseiten dieser Gemeinde!</span>
                     </div>
                 </td>
             </tr>