diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py
index 30136222..b67a0908 100644
--- a/src/octoprint/server/util/flask.py
+++ b/src/octoprint/server/util/flask.py
@@ -227,8 +227,10 @@ def passive_login():
 		user = flask.ext.login.current_user
 
 	if user is not None and not user.is_anonymous():
-		flask.g.user = user
 		flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id()))
+		if hasattr(user, "get_session"):
+			flask.session["usersession.id"] = user.get_session()
+		flask.g.user = user
 		return flask.jsonify(user.asDict())
 	elif settings().getBoolean(["accessControl", "autologinLocal"]) \
 			and settings().get(["accessControl", "autologinAs"]) is not None \
@@ -252,7 +254,7 @@ def passive_login():
 			logger = logging.getLogger(__name__)
 			logger.exception("Could not autologin user %s for networks %r" % (autologinAs, localNetworks))
 
-	return ("", 204)
+	return "", 204
 
 
 #~~ cache decorator for cacheable views
diff --git a/src/octoprint/users.py b/src/octoprint/users.py
index fc5be2b7..7c40d2d8 100644
--- a/src/octoprint/users.py
+++ b/src/octoprint/users.py
@@ -28,13 +28,18 @@ class UserManager(object):
 	def login_user(self, user):
 		self._cleanup_sessions()
 
-		if user is None \
-		        or (isinstance(user, LocalProxy) and not isinstance(user._get_current_object(), User)) \
-		        or (not isinstance(user, LocalProxy) and not isinstance(user, User)):
+		if user is None:
+			return
+
+		if isinstance(user, LocalProxy):
+			user = user._get_current_object()
+
+		if not isinstance(user, User):
 			return None
 
 		if not isinstance(user, SessionUser):
 			user = SessionUser(user)
+
 		self._session_users_by_session[user.get_session()] = user
 
 		if not user.get_name() in self._session_users_by_username:
@@ -49,6 +54,9 @@ class UserManager(object):
 		if user is None:
 			return
 
+		if isinstance(user, LocalProxy):
+			user = user._get_current_object()
+
 		if not isinstance(user, SessionUser):
 			return
 
@@ -146,12 +154,10 @@ class UserManager(object):
 			del self._session_users_by_username[username]
 
 	def findUser(self, username=None, session=None):
-		if session is not None:
-			for session in self._session_users_by_session:
-				user = self._session_users_by_session[session]
-				if username is None or username == user.get_name():
-					return user
-				break
+		if session is not None and session in self._session_users_by_session:
+			user = self._session_users_by_session[session]
+			if username is None or username == user.get_id():
+				return user
 
 		return None