diff --git a/mxcubeweb/core/components/lims.py b/mxcubeweb/core/components/lims.py
index 29157a755..cf75dce20 100644
--- a/mxcubeweb/core/components/lims.py
+++ b/mxcubeweb/core/components/lims.py
@@ -226,10 +226,6 @@ def lims_login(self, loginID, password, create_session):
                 )
                 return ERROR_CODE
 
-            for prop in session["proposal_list"]:
-                todays_session = HWR.beamline.lims.get_todays_session(prop)
-                prop["Session"] = [todays_session["session"]]
-
             if hasattr(
                 HWR.beamline.session, "commissioning_fake_proposal"
             ) and HWR.beamline.session.is_inhouse(loginID, None):
@@ -326,7 +322,7 @@ def select_proposal(self, proposal):
             )
 
             todays_session = HWR.beamline.lims.get_todays_session(
-                proposal_info, create_session=False
+                proposal_info, create_session=True
             )
             HWR.beamline.session.session_id = todays_session.get("session").get(
                 "sessionId"
diff --git a/mxcubeweb/core/components/user/usermanager.py b/mxcubeweb/core/components/user/usermanager.py
index e04133f5a..ad6767f5d 100644
--- a/mxcubeweb/core/components/user/usermanager.py
+++ b/mxcubeweb/core/components/user/usermanager.py
@@ -383,10 +383,12 @@ def _login(self, login_id: str, password: str):
             raise Exception("Remote access disabled")
 
         # Only allow remote logins with existing sessions
-        if self.app.lims.lims_valid_login(login_res) and is_local_host():
-            if not self.app.lims.lims_existing_session(login_res):
-                login_res = self.app.lims.create_lims_session(login_res)
-
+        if (
+            self.app.lims.lims_valid_login(login_res)
+            and is_local_host()
+            and HWR.beamline.lims.loginType.lower() != "user"
+        ):
+        and HWR.beamline.lims.loginType.lower() != "user":
             msg = "[LOGIN] Valid login from local host (%s)" % str(info)
             logging.getLogger("MX3.HWR").info(msg)
         elif self.app.lims.lims_valid_login(