diff --git a/Solutions/Okta Single Sign-On/Package/3.0.0.zip b/Solutions/Okta Single Sign-On/Package/3.0.0.zip
index 70ce284a0ca..61e63b1526d 100644
Binary files a/Solutions/Okta Single Sign-On/Package/3.0.0.zip and b/Solutions/Okta Single Sign-On/Package/3.0.0.zip differ
diff --git a/Solutions/Okta Single Sign-On/Package/mainTemplate.json b/Solutions/Okta Single Sign-On/Package/mainTemplate.json
index bc91457375c..8c8adf3a75b 100644
--- a/Solutions/Okta Single Sign-On/Package/mainTemplate.json	
+++ b/Solutions/Okta Single Sign-On/Package/mainTemplate.json	
@@ -201,7 +201,9 @@
     "huntingQueryId10": "[resourceId('Microsoft.OperationalInsights/savedSearches', variables('_huntingQuerycontentId10'))]",
     "huntingQueryTemplateSpecName10": "[concat(parameters('workspace'),'/Microsoft.SecurityInsights/',concat(parameters('workspace'),'-hq-',uniquestring(variables('_huntingQuerycontentId10'))))]",
     "_huntingQuerycontentProductId10": "[concat(take(variables('_solutionId'),50),'-','hq','-', uniqueString(concat(variables('_solutionId'),'-','HuntingQuery','-',variables('_huntingQuerycontentId10'),'-', variables('huntingQueryVersion10'))))]",
-    "_solutioncontentProductId": "[concat(take(variables('_solutionId'),50),'-','sl','-', uniqueString(concat(variables('_solutionId'),'-','Solution','-',variables('_solutionId'),'-', variables('_solutionVersion'))))]"
+    "_solutioncontentProductId": "[concat(take(variables('_solutionId'),50),'-','sl','-', uniqueString(concat(variables('_solutionId'),'-','Solution','-',variables('_solutionId'),'-', variables('_solutionVersion'))))]",
+    "Session": "authenticationContext_externalSessionId_s",
+	"_Session": "[variables('Session')]"
   },
   "resources": [
     {
@@ -3830,7 +3832,7 @@
                 ],
                 "customDetails": {
                   "Location": "Location",
-                  "SessionId": "authenticationContext_externalSessionId_s"
+                  "SessionId": "[variables('_Session')]"
                 },
                 "alertDetailsOverride": {
                   "alertDescriptionFormat": "This query identifies users seen login from new geo location/country {{Location}} as well as a new device and performing critical operations\n",
@@ -4062,7 +4064,7 @@
                   }
                 ],
                 "customDetails": {
-                  "SessionId": "authenticationContext_externalSessionId_s"
+                  "SessionId": "[variables('_Session')]"
                 }
               }
             },