diff --git a/server.py b/server.py
index e1c64e649794d1e55a26706812c0963859f42a27..be1aa86f3aa3870885bb59346bd65ce6eb215488 100755
--- a/server.py
+++ b/server.py
@@ -15,11 +15,9 @@ config['SQLITE_INIT_SCHEMA'] = True
 config['SQLITE_INIT_DATA'] = False
 config['DEBUG'] = False
 config['VIDEOPREFIX'] = 'https://videoag.fsmpi.rwth-aachen.de'
-
 if __name__ == '__main__':
 	config['SQLITE_INIT_DATA'] = True
 	config['DEBUG'] = True
-
 config.from_pyfile('config.py', silent=True)
 
 from db import query, searchquery, ldapauth, ldapget
@@ -144,18 +142,12 @@ def login():
 		session['user'] = ldapget(user)
 	else:
 		flash('Login fehlgeschlagen!')
-	if 'ref' in request.values:
-		return redirect(request.values['ref'])
-	else:
-		return redirect(url_for('index'))
+	return redirect(request.values.get('ref', url_for('index')))
 
-@app.route('/logout')
+@app.route('/logout', methods=['GET', 'POST'])
 def logout():
 	session.pop('user')
-	if 'ref' in request.values:
-		return redirect(request.values['ref'])
-	else:
-		return redirect(url_for('index'))
+	return redirect(request.values.get('ref', url_for('index')))
 
 @app.route('/edit', methods=['GET', 'POST'])
 @mod_required