diff --git a/apps/dashboard/src/main/java/com/akto/action/user/OktaSsoAction.java b/apps/dashboard/src/main/java/com/akto/action/user/OktaSsoAction.java
index c971a50ef3..719c9a01d9 100644
--- a/apps/dashboard/src/main/java/com/akto/action/user/OktaSsoAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/user/OktaSsoAction.java
@@ -35,11 +35,12 @@ public String addOktaSso() {
oktaConfig.setAuthorisationServerId(authorisationServerId);
oktaConfig.setOktaDomainUrl(oktaDomain);
oktaConfig.setRedirectUri(redirectUri);
- oktaConfig.setAccountId(Context.accountId.get());
- String userLogin = getSUser().getLogin();
- String domain = userLogin.split("@")[1];
- oktaConfig.setOrganizationDomain(domain);
-
+ if(!DashboardMode.isOnPremDeployment()){
+ oktaConfig.setAccountId(Context.accountId.get());
+ String userLogin = getSUser().getLogin();
+ String domain = userLogin.split("@")[1];
+ oktaConfig.setOrganizationDomain(domain);
+ }
ConfigsDao.instance.insertOne(oktaConfig);
return SUCCESS.toUpperCase();
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/OktaIntegration.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/OktaIntegration.jsx
index be8d1e2833..21fa86632c 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/OktaIntegration.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/OktaIntegration.jsx
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'
import CopyCommand from '../../../components/shared/CopyCommand';
import IntegrationsLayout from './IntegrationsLayout';
-import { Button, Form, FormLayout, HorizontalStack, LegacyCard, Text, TextField } from '@shopify/polaris';
+import { Button, Form, FormLayout, HorizontalStack, LegacyCard, Link, Text, TextField, VerticalStack } from '@shopify/polaris';
import func from "@/util/func"
import settingRequests from '../api';
import SpinnerCentered from "../../../components/progress/SpinnerCentered"
@@ -135,6 +135,19 @@ function OktaIntegration() {
},[])
const cardContent = "Enable login via Okta SSO in your dashboard."
+
+ const useCardContent = (
+
+ {cardContent}
+
+ Use
+ https://app.akto.io/sso-login
+ for signing into AKTO dashboard via SSO.
+
+
+ )
+
+
const oktaSSOComponent = (
loading ? :
@@ -145,7 +158,7 @@ function OktaIntegration() {
return (
<>
-
+
>
)