diff --git a/Solutions/Okta Single Sign-On/Package/3.1.2.zip b/Solutions/Okta Single Sign-On/Package/3.1.2.zip
index d1da61efce4..4d1ab12f470 100644
Binary files a/Solutions/Okta Single Sign-On/Package/3.1.2.zip and b/Solutions/Okta Single Sign-On/Package/3.1.2.zip differ
diff --git a/Solutions/Okta Single Sign-On/Package/mainTemplate.json b/Solutions/Okta Single Sign-On/Package/mainTemplate.json
index 4ede49b10b1..946b694f161 100644
--- a/Solutions/Okta Single Sign-On/Package/mainTemplate.json	
+++ b/Solutions/Okta Single Sign-On/Package/mainTemplate.json	
@@ -234,6 +234,8 @@
       "parserVersion1": "1.0.2",
       "parserContentId1": "OktaSSO-Parser"
     },
+    "SessionId": "authenticationContext_externalSessionId_s",
+    "_SessionId": "[variables('SessionId')]",
     "_solutioncontentProductId": "[concat(take(variables('_solutionId'),50),'-','sl','-', uniqueString(concat(variables('_solutionId'),'-','Solution','-',variables('_solutionId'),'-', variables('_solutionVersion'))))]"
   },
   "resources": [
@@ -792,7 +794,7 @@
                 ],
                 "customDetails": {
                   "Location": "Location",
-                  "SessionId": "authenticationContext_externalSessionId_s"
+                  "SessionId": "[variables('_SessionId')]"
                 },
                 "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",
@@ -1036,7 +1038,7 @@
                   }
                 ],
                 "customDetails": {
-                  "SessionId": "authenticationContext_externalSessionId_s"
+                  "SessionId": "[variables('_SessionId')]"
                 }
               }
             },