diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py
index 2788dd6c..7b8c66b4 100644
--- a/src/octoprint/server/util/flask.py
+++ b/src/octoprint/server/util/flask.py
@@ -247,9 +247,13 @@ def passive_login():
 			if netaddr.IPAddress(remoteAddr) in localNetworks:
 				user = octoprint.server.userManager.findUser(autologinAs)
 				if user is not None:
-					flask.g.user = user
 					flask.ext.login.login_user(user)
+					if octoprint.server.userManager.enabled:
+						user = octoprint.server.userManager.login_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())
 		except:
 			logger = logging.getLogger(__name__)