diff --git a/events.php b/events.php
index b95c8dea0910a1d567474f43619f54e8649963dc..9b19f012a8592f34ad686aa22da72905ff20baad 100644
--- a/events.php
+++ b/events.php
@@ -18,10 +18,19 @@ PRODID:-//Sam events//NONSGML//EN
 X-WR-CALNAME:Sam events\n\n";
 
 // get events
-$events = $bdd->prepare('SELECT id, title, date, place, description
-	FROM sam
-	ORDER BY date');
-$events->execute();
+if (isset($_GET['nick'])) {
+	$events = $bdd->prepare('SELECT s.id, title, date, place, description
+		FROM sam s JOIN sam_users su ON s.id = su.event
+		WHERE nick = ?
+		ORDER BY date');
+	$events->execute(array($_GET['nick']));
+}
+else {
+	$events = $bdd->prepare('SELECT id, title, date, place, description
+		FROM sam
+		ORDER BY date');
+	$events->execute();
+}
 
 // loop over events
 while ($event = $events->fetch()) {