diff --git a/cutprogress.py b/cutprogress.py
index 0b382351241fdca61df19c6d57f5a4ab4b6c034a..7fd7aac995a7c080902c5cc02ba89d57b12cfc2a 100644
--- a/cutprogress.py
+++ b/cutprogress.py
@@ -11,10 +11,6 @@ def cutprogress(user=None):
 	allsemester = query('SELECT DISTINCT semester from courses ORDER BY semester DESC')
 	semester = request.values.get('semester', allsemester[0]['semester'])
 
-	# filter to single user?
-	if user is not None:
-		user = query('SELECT * FROM users WHERE id = ?', user)[0]
-
 	# column headers: courses
 	courses = query('''
 		SELECT courses.id, courses.handle, courses.short, courses.responsible
@@ -91,7 +87,7 @@ def cutprogress(user=None):
 		# dropdown selection
 		allsemester=allsemester, # options
 		semester=semester, # choice
-		user=user,
+		user=query('SELECT * FROM users WHERE id = ?', user)[0],
 
 		# content
 		courses=courses,