diff --git a/frontend/src/modules/common/components/BaseManageOrgConstants/BaseManageOrgConstants.jsx b/frontend/src/modules/common/components/BaseManageOrgConstants/BaseManageOrgConstants.jsx
index 92ae536712..85331a84c4 100644
--- a/frontend/src/modules/common/components/BaseManageOrgConstants/BaseManageOrgConstants.jsx
+++ b/frontend/src/modules/common/components/BaseManageOrgConstants/BaseManageOrgConstants.jsx
@@ -348,10 +348,10 @@ const BaseManageOrgConstants = ({
           toast.success('Constant updated successfully');
           onCancelBtnClicked();
         })
-        .catch(({ error }) => {
+        .catch(({ error, data }) => {
           setErrors(error);
-          toast.error(error);
-          if (error === NoPermissionMessage) {
+          toast.error(data?.statusCode === 403 ? 'You do not have permissions to perform this action' : data?.message);
+          if (error === NoPermissionMessage || data?.statusCode === 403) {
             redirectToWorkspace();
           }
         })
@@ -364,10 +364,10 @@ const BaseManageOrgConstants = ({
         toast.success(`${variable.type} constant created successfully!`);
         onCancelBtnClicked();
       })
-      .catch(({ error }) => {
+      .catch(({ error, data }) => {
         setErrors(error);
-        toast.error(error || 'Constant could not be created');
-        if (error === NoPermissionMessage) {
+        toast.error(data?.statusCode === 403 ? 'You do not have permissions to perform this action' : data?.message);
+        if (error === NoPermissionMessage || data?.statusCode === 403) {
           redirectToWorkspace();
         }
       })
@@ -390,9 +390,10 @@ const BaseManageOrgConstants = ({
         setSelectedConstant(null);
         setMode(MODES.NULL);
       })
-      .catch(({ error }) => {
-        toast.error(error);
-        if (error === NoPermissionMessage) {
+      .catch(({ error, data }) => {
+        setErrors(error);
+        toast.error(data?.statusCode === 403 ? 'You do not have permissions to perform this action' : data?.message);
+        if (error === NoPermissionMessage || data?.statusCode === 403) {
           redirectToWorkspace();
         }
       })
diff --git a/frontend/src/modules/onboarding/components/OnboardingQuestions/components/WorkspaceNameForm/WorkspaceNameForm.jsx b/frontend/src/modules/onboarding/components/OnboardingQuestions/components/WorkspaceNameForm/WorkspaceNameForm.jsx
index 4d281ecc55..224f0d05ed 100644
--- a/frontend/src/modules/onboarding/components/OnboardingQuestions/components/WorkspaceNameForm/WorkspaceNameForm.jsx
+++ b/frontend/src/modules/onboarding/components/OnboardingQuestions/components/WorkspaceNameForm/WorkspaceNameForm.jsx
@@ -83,7 +83,9 @@ const WorkspaceNameForm = () => {
       setFormData({ workspaceName: defaultWorkspaceName });
       setIsFormValid(true);
     };
-    handleDefaultWorkspaceName();
+    if (!formData.workspaceName || formData.workspaceName === '') {
+      handleDefaultWorkspaceName();
+    }
   }, [adminDetails.email, inviteeEmail]);
 
   const isWorkspaceNameUnique = async (value) => {