diff --git a/gp-okta.py b/gp-okta.py
index e3e22c6..e265847 100755
--- a/gp-okta.py
+++ b/gp-okta.py
@@ -153,6 +153,14 @@ def mfa_priority(conf, ftype, fprovider):
 		priority += (512 - line_nr)
 	return priority
 
+def get_state_token(conf, c, current_url = None):
+        rx_state_token = re.search(r'var\s*stateToken\s*=\s*\'([^\']+)\'', c)
+	if not rx_state_token:
+		dbg(conf.get('debug'), 'not found', 'stateToken')
+		return None
+	state_token = to_b(rx_state_token.group(1)).decode('unicode_escape').strip()
+	return state_token
+
 def get_redirect_url(conf, c, current_url = None):
 	rx_base_url = re.search(r'var\s*baseUrl\s*=\s*\'([^\']+)\'', c)
 	rx_from_uri = re.search(r'var\s*fromUri\s*=\s*\'([^\']+)\'', c)
@@ -222,7 +230,7 @@ def okta_saml(conf, s, saml_xml):
 		err('did not find redirect url')
 	return redirect_url
 
-def okta_auth(conf, s):
+def okta_auth(conf, s, stateToken = None):
 	log('okta auth request')
 	url = '{0}/api/v1/authn'.format(conf.get('okta_url'))
 	data = {
@@ -232,6 +240,8 @@ def okta_auth(conf, s):
 			'warnBeforePasswordExpired':True,
 			'multiOptionalFactorEnroll':True
 		}
+	} if stateToken is None else {
+		'stateToken': stateToken
 	}
 	h, j = send_req(conf, s, 'auth', url, data, json=True)
 
@@ -370,12 +380,15 @@ def okta_redirect(conf, s, session_token, redirect_url):
 			url = '{0}/login/sessionCookieRedirect'.format(conf.get('okta_url'))
 			log('okta redirect request')
 			h, c = send_req(conf, s, 'redirect', url, data)
+                        state_token = get_state_token(conf, c, url)
 			redirect_url = get_redirect_url(conf, c, url)
 			if redirect_url:
 				form_url, form_data = None, {}
 			else:
 				xhtml = parse_html(c)
 				form_url, form_data = parse_form(xhtml, url)
+                        if state_token is not None:
+                                okta_auth(conf, s, state_token)
 		elif form_url:
 			log('okta redirect form request')
 			h, c = send_req(conf, s, 'redirect form', form_url, form_data)