diff --git a/src/app/components/event/event.component.html b/src/app/components/event/event.component.html
index 712368a..7e96b92 100644
--- a/src/app/components/event/event.component.html
+++ b/src/app/components/event/event.component.html
@@ -22,12 +22,19 @@
 	<td>
 		<input type="text" [(ngModel)]="event!.location">
 	</td>
-	<td>
-		{{event?.createdBy}}
-	</td>
 	<td class="{{invalidUrlError? 'has-error' : ''}}">
 		<input type="text" [(ngModel)]="event!.url">
 	</td>
+	<td>
+		By: {{event?.createdBy}}
+		<br>
+		At: {{printDate(event?.createdDate!)}}
+	</td>
+	<td>
+		By: {{event?.lastModifiedBy}}
+		<br>
+		At: {{printDate(event?.lastModifiedDate!)}}
+	</td>
 	<td>
 		<select [(ngModel)]="event!.status">
 			<option value="DRAFT">Draft</option>
@@ -73,10 +80,17 @@
 		{{event?.location}}
 	</td>
 	<td>
-		{{event?.createdBy}}
+		{{event?.url}}
 	</td>
 	<td>
-		{{event?.url}}
+		By: {{event?.createdBy}}
+		<br>
+		At: {{printDate(event?.createdDate!)}}
+	</td>
+	<td>
+		By: {{event?.lastModifiedBy}}
+		<br>
+		At: {{printDate(event?.lastModifiedDate!)}}
 	</td>
 	<td>
 		{{getEventStatusFriendlyName()}}
diff --git a/src/app/components/event/event.component.ts b/src/app/components/event/event.component.ts
index 56a1f63..6e9a2e3 100644
--- a/src/app/components/event/event.component.ts
+++ b/src/app/components/event/event.component.ts
@@ -141,6 +141,20 @@ export class EventComponent implements OnInit {
 		return `${hours}:${minutes}`;
 	}
 
+	printDate(date: Date): string {
+		try {
+			let year = date.getFullYear();
+			let month = (date.getMonth() + 1).toString().padStart(2, '0');
+			let day = date.getDate().toString().padStart(2, '0');
+			let hours = date.getHours().toString().padStart(2, '0');
+			let minutes = date.getMinutes().toString().padStart(2, '0');
+
+			return `${day}.${month}.${year}, ${hours}:${minutes}`;
+		} catch (e) {
+			return '';
+		}
+	}
+
 	parseDate(text: string): Date {
 		return new Date(text);
 	}
diff --git a/src/app/components/events-table/events-table.component.html b/src/app/components/events-table/events-table.component.html
index b975078..83f79e0 100644
--- a/src/app/components/events-table/events-table.component.html
+++ b/src/app/components/events-table/events-table.component.html
@@ -7,8 +7,9 @@
 		<th>Start</th>
 		<th>End</th>
 		<th>Location</th>
-		<th>Created by</th>
 		<th>URL</th>
+		<th>Created</th>
+		<th>Last Modified</th>
 		<th>Status</th>
 		<th>Edit</th>
 		<th>Move</th>
diff --git a/src/app/models/event.ts b/src/app/models/event.ts
index fd596c8..9cf304f 100644
--- a/src/app/models/event.ts
+++ b/src/app/models/event.ts
@@ -7,8 +7,10 @@ export interface Event {
 	startDateTime: Date;
 	endDateTime: Date;
 	createdDate: Date;
+	lastModifiedDate: Date;
 	location: string;
 	createdBy: string;
+	lastModifiedBy: string;
 	url: string;
 	wholeDay: boolean;
 	status: string;
diff --git a/src/app/pages/admin/admin.component.ts b/src/app/pages/admin/admin.component.ts
index 90ced7f..8baa585 100644
--- a/src/app/pages/admin/admin.component.ts
+++ b/src/app/pages/admin/admin.component.ts
@@ -57,7 +57,8 @@ export class AdminComponent implements OnInit {
 						...event,
 						startDateTime: new Date(event.startDateTime),
 						endDateTime: new Date(event.endDateTime),
-						createdDate: new Date(event.createdDate)
+						createdDate: new Date(event.createdDate),
+						lastModifiedDate: new Date(event.lastModifiedDate)
 					});
 				}
 			}