diff --git a/edit.py b/edit.py
index a304a58f160c57d4d2020e1221511569b18ab27d..a0423b1fb23504e416740a46f97c379de4a8ced7 100644
--- a/edit.py
+++ b/edit.py
@@ -175,6 +175,8 @@ def create(table):
 		values.append(val)
 	id = modify('INSERT INTO %s (%s) VALUES (%s)'%(editable_tables[table]['table'],
 				','.join(columns), ','.join(['?']*len(values))), *values)
+	if table == 'courses':
+		set_responsible(id, session['user']['dbid'], 1)
 	if 'ref' in request.values:
 		return redirect(request.values['ref'])
 	return str(id), 200
diff --git a/server.py b/server.py
index f2704ed5fc59fd5c391a3e2fed10497cf314e3f7..84f35fc36f3fad8621bd1318813cb0324fab2204 100644
--- a/server.py
+++ b/server.py
@@ -333,11 +333,7 @@ def search():
 	q = request.args['q']
 	courses = searchquery(q, '*', ['title', 'short', 'organizer', 'subject', 'description'],
 			'courses', 'WHERE (? OR (visible AND listed)) GROUP BY id ORDER BY _score DESC, semester DESC LIMIT 20', ismod())
-	#lectures = searchquery(q, 'lectures.*, courses.visible AS coursevisible, courses.listed, "course" AS sep, courses.*',
-	#			['lectures.title', 'lectures.comment', 'lectures.speaker', 'courses.short'],
-	#			'lectures LEFT JOIN courses on (courses.id = lectures.course_id)',
-	#			'WHERE (? OR (coursevisible AND listed AND visible)) GROUP BY id ORDER BY _score DESC, time DESC LIMIT 30', ismod())
-	lectures = searchquery(q, 'lectures.*, courses.visible AS coursevisible, courses.listed, courses.id AS courses_id, courses.visible AS courses_visible, courses.listed AS courses_listed, courses.title AS courses_title, courses.short AS courses_short, courses.handle AS courses_handle, courses.organizer AS courses_organizer, courses.subject AS courses_subject, courses.credits AS courses_credits, courses.created_by AS courses_created_by, courses.time_created AS courses_time_created, courses.time_updated AS courses_time_updated, courses.semester AS courses_semester, courses.downloadable AS courses_downloadable, courses.embedinvisible AS courses_embedinvisible, courses.description AS courses_description, courses.internal AS courses_internal, courses.responsible AS courses_responsible',
+	lectures = searchquery(q, 'lectures.*, courses.visible AS coursevisible, courses.listed, courses.id AS courses_id, courses.visible AS courses_visible, courses.listed AS courses_listed, courses.title AS courses_title, courses.short AS courses_short, courses.handle AS courses_handle, courses.organizer AS courses_organizer, courses.subject AS courses_subject, courses.credits AS courses_credits, courses.created_by AS courses_created_by, courses.time_created AS courses_time_created, courses.time_updated AS courses_time_updated, courses.semester AS courses_semester, courses.downloadable AS courses_downloadable, courses.embedinvisible AS courses_embedinvisible, courses.description AS courses_description, courses.internal AS courses_internal',
 			['lectures.title', 'lectures.comment', 'lectures.speaker', 'courses.short'],
 			'lectures LEFT JOIN courses on (courses.id = lectures.course_id)',
 			'WHERE (? OR (coursevisible AND listed AND visible)) GROUP BY id ORDER BY _score DESC, time DESC LIMIT 30', ismod())
diff --git a/templates/courses.html b/templates/courses.html
index 9eb562f0905ef49a41c9730f0f68f13525bb3f16..a65de35a0b80b0e6a492a43e1cf94e5bf9051bed 100644
--- a/templates/courses.html
+++ b/templates/courses.html
@@ -13,7 +13,7 @@
 			</li>
 			<li>
 				{% set newhandle = 'new'+(randint(0,1000)|string) %}
-				<a class="btn btn-default" href="{{ url_for('create', table='courses', handle=newhandle, title='Neue Veranstaltung', responsible=session.user.givenName, ref=url_for('course', handle=newhandle)) }}">Neue Veranstaltung</a>
+				<a class="btn btn-default" href="{{ url_for('create', table='courses', handle=newhandle, title='Neue Veranstaltung', ref=url_for('course', handle=newhandle)) }}">Neue Veranstaltung</a>
 			</li>
 			{% endif %}
 			<li class="dropdown pull-right" style="padding-right: 0px">