diff --git a/uffd/__init__.py b/uffd/__init__.py
index b0d298f79da0afe7fa6a40e314da36bf151666bc..9ff360af5be81a722a578725caad1c329825d685 100644
--- a/uffd/__init__.py
+++ b/uffd/__init__.py
@@ -42,24 +42,27 @@ def create_app(test_config=None): # pylint: disable=too-many-locals
 		pass
 
 	db.init_app(app)
-	# pylint: disable=C0415
-	from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services, signup, invite
-	# pylint: enable=C0415
 
 	if app.config['LDAP_SERVICE_BIND_DN']:
+		# pylint: disable=C0415
+		from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services, signup, invite
+		# pylint: enable=C0415
 		for i in user.bp + selfservice.bp + role.bp + mail.bp + session.bp + csrf.bp + mfa.bp + oauth2.bp + services.bp + signup.bp + invite.bp:
 			app.register_blueprint(i)
 	else:
+		# pylint: disable=C0415
+		from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services
+		# pylint: enable=C0415
 		app.config['ENABLE_PASSWORDRESET'] = False
 		for i in user.bp + selfservice.bp + role.bp + mail.bp + session.bp + csrf.bp + mfa.bp + oauth2.bp + services.bp:
 			app.register_blueprint(i)
 
 	@app.route("/")
-	def index():  #pylint: disable=unused-variable
+	def index(): #pylint: disable=unused-variable
 		return redirect(url_for('selfservice.index'))
 
 	@app.teardown_request
-	def close_connection(exception):  #pylint: disable=unused-variable,unused-argument
+	def close_connection(exception): #pylint: disable=unused-variable,unused-argument
 		if hasattr(request, "ldap_connection"):
 			request.ldap_connection.unbind()
 
diff --git a/uffd/session/views.py b/uffd/session/views.py
index d4dd103c5070f0ba2a2279314dc9d1f47585bb9c..b8d716293ea86556da1edfbb200c1a0a50ba9b0c 100644
--- a/uffd/session/views.py
+++ b/uffd/session/views.py
@@ -38,6 +38,7 @@ def logout():
 	return resp
 
 def set_session(user, password='', skip_mfa=False):
+	session.clear()
 	session['user_dn'] = user.dn
 	# only save the password if we use a user connection
 	if password and not current_app.config['LDAP_SERVICE_BIND_DN']: