diff --git a/main.py b/main.py
index 26cea2c..bc39d61 100644
--- a/main.py
+++ b/main.py
@@ -252,34 +252,25 @@ def _session(id):
     con.commit()
     cur.close()
 
-    if len(eventzeit) > 0 and len(eventname) > 0:
-        return render_template("session.html",
-                               zeit=zeit,
-                               aktivitaet=aktivitaet,
-                               user=user,
-                               eventname=eventname[0],
-                               eventzeit=eventzeit[0],
-                               game=game,
-                               useranzahl=useranzahl,
-                               creator=creator,
-                               mate=mate,
-                               uids=uids,
-                               unames=unames,
-                               der=uptime())
-    elif len(eventzeit) == 0 and len(eventname) == 0:
-        return render_template("session.html",
-                               zeit=zeit,
-                               aktivitaet=aktivitaet,
-                               user=user,
-                               eventname=eventname,
-                               eventzeit=eventzeit,
-                               game=game,
-                               useranzahl=useranzahl,
-                               creator=creator,
-                               mate=mate,
-                               uids=uids,
-                               unames=unames,
-                               der=uptime())
+    class eventData:
+        def __init__(self, evn, evz):
+            self.eventname = evn
+            self.eventzeit = evz
+
+    eventdata = eventData(eventname, eventzeit)
+
+    return render_template("session.html",
+                           zeit=zeit,
+                           aktivitaet=aktivitaet,
+                           user=user,
+                           eventdata=eventdata,
+                           game=game,
+                           useranzahl=useranzahl,
+                           creator=creator,
+                           mate=mate,
+                           uids=uids,
+                           unames=unames,
+                           der=uptime())
 
 
 @app.route("/mate", methods=['POST'])
diff --git a/templates/session.html b/templates/session.html
index e12b95d..5001d6d 100644
--- a/templates/session.html
+++ b/templates/session.html
@@ -56,9 +56,11 @@
 					<th>Status</th>
 				</tr>
 				<tr>
-					<td>{{ eventname }}</td>
-					<td>{{ eventzeit }}</td>
+					{% for event in eventdata }
+					<td>{{ event.eventname }}</td>
+					<td>{{ event.eventzeit }}</td>
 					<td>Status</td>
+					{% endfor }
 				</tr>
 			</table>
 			<p>Füge ein Event ein</p>