diff --git a/Solutions/Okta Single Sign-On/Package/3.1.0.zip b/Solutions/Okta Single Sign-On/Package/3.1.0.zip
index 3dcc17574e6..e8fd7d8785c 100644
Binary files a/Solutions/Okta Single Sign-On/Package/3.1.0.zip and b/Solutions/Okta Single Sign-On/Package/3.1.0.zip differ
diff --git a/Solutions/Okta Single Sign-On/Package/mainTemplate.json b/Solutions/Okta Single Sign-On/Package/mainTemplate.json
index 21b256b134b..762419b53a1 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": [
@@ -785,7 +787,7 @@
                   }
                 ],
                 "customDetails": {
-                  "SessionId": "authenticationContext_externalSessionId_s",
+                  "SessionId": "[variables('_SessionId')]",
                   "Location": "Location"
                 },
                 "alertDetailsOverride": {
@@ -1030,7 +1032,7 @@
                   }
                 ],
                 "customDetails": {
-                  "SessionId": "authenticationContext_externalSessionId_s"
+                  "SessionId": "[variables('_SessionId')]"
                 }
               }
             },