diff --git a/frappe/auth.py b/frappe/auth.py
index dd7f76d938..7c2302d4a8 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -125,9 +125,6 @@ class LoginManager:
 			if self.login() is False:
 				return
 			self.resume = False
-
-			# run login triggers
-			self.run_trigger("on_session_creation")
 		else:
 			try:
 				self.resume = True
@@ -233,6 +230,8 @@ class LoginManager:
 		self.user = frappe.local.session_obj.user
 		frappe.local.session = frappe.local.session_obj.data
 		self.clear_active_sessions()
+		if not resume:
+			self.run_trigger("on_session_creation")
 
 	def clear_active_sessions(self):
 		"""Clear other sessions of the current user if `deny_multiple_sessions` is not set"""
diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py
index e1f1b4bb2a..d41304084b 100644
--- a/frappe/utils/oauth.py
+++ b/frappe/utils/oauth.py
@@ -204,8 +204,7 @@ def login_oauth_user(
 			http_status_code=403,
 		)
 
-	frappe.local.login_manager.user = user
-	frappe.local.login_manager.post_login()
+	frappe.local.login_manager.login_as(user)
 
 	# because of a GET request!
 	frappe.db.commit()