diff --git a/libs/ktem/ktem/assets/js/main.js b/libs/ktem/ktem/assets/js/main.js
index eaebb1b5d..8e6385357 100644
--- a/libs/ktem/ktem/assets/js/main.js
+++ b/libs/ktem/ktem/assets/js/main.js
@@ -70,6 +70,15 @@ function run() {
   );
   chat_setting_panel.insertBefore(citation_dropdown, mindmap_checkbox);
 
+  // move share conv checkbox
+  let report_div = document.querySelector(
+    "#report-accordion > div:nth-child(3) > div:nth-child(1)"
+  );
+  let share_conv_checkbox = document.getElementById("is-public-checkbox");
+  if (share_conv_checkbox) {
+    report_div.insertBefore(share_conv_checkbox, report_div.querySelector("button"));
+  }
+
   // create slider toggle
   const is_public_checkbox = document.getElementById("suggest-chat-checkbox");
   const label_element = is_public_checkbox.getElementsByTagName("label")[0];
diff --git a/libs/ktem/ktem/pages/chat/__init__.py b/libs/ktem/ktem/pages/chat/__init__.py
index fd658adb5..2f9ab94f2 100644
--- a/libs/ktem/ktem/pages/chat/__init__.py
+++ b/libs/ktem/ktem/pages/chat/__init__.py
@@ -37,6 +37,7 @@
 from .report import ReportIssue
 
 KH_DEMO_MODE = getattr(flowsettings, "KH_DEMO_MODE", False)
+KH_SSO_ENABLED = getattr(flowsettings, "KH_SSO_ENABLED", False)
 KH_WEB_SEARCH_BACKEND = getattr(flowsettings, "KH_WEB_SEARCH_BACKEND", None)
 WebSearch = None
 if KH_WEB_SEARCH_BACKEND:
@@ -318,7 +319,9 @@ def on_building_ui(self):
                 ) as self.chat_settings:
                     with gr.Row(elem_id="quick-setting-labels"):
                         gr.HTML("Reasoning method")
-                        gr.HTML("Model", visible=not KH_DEMO_MODE)
+                        gr.HTML(
+                            "Model", visible=not KH_DEMO_MODE and not KH_SSO_ENABLED
+                        )
                         gr.HTML("Language")
 
                     with gr.Row():
@@ -346,7 +349,7 @@ def on_building_ui(self):
                             value=model_setting.value,
                             container=False,
                             show_label=False,
-                            visible=not KH_DEMO_MODE,
+                            visible=not KH_DEMO_MODE and not KH_SSO_ENABLED,
                         )
                         self.language = gr.Dropdown(
                             choices=language_setting.choices,
diff --git a/libs/ktem/ktem/pages/chat/control.py b/libs/ktem/ktem/pages/chat/control.py
index d9ad10620..fb2b50c7c 100644
--- a/libs/ktem/ktem/pages/chat/control.py
+++ b/libs/ktem/ktem/pages/chat/control.py
@@ -16,6 +16,7 @@
 logger = logging.getLogger(__name__)
 
 KH_DEMO_MODE = getattr(flowsettings, "KH_DEMO_MODE", False)
+KH_SSO_ENABLED = getattr(flowsettings, "KH_SSO_ENABLED", False)
 ASSETS_DIR = "assets/icons"
 if not os.path.isdir(ASSETS_DIR):
     ASSETS_DIR = "libs/ktem/ktem/assets/icons"
@@ -110,12 +111,10 @@ def on_building_ui(self):
             )
             self.cb_is_public = gr.Checkbox(
                 value=False,
-                label="Shared",
-                min_width=10,
-                scale=4,
+                label="Share this conversation",
                 elem_id="is-public-checkbox",
                 container=False,
-                visible=False,
+                visible=not KH_DEMO_MODE and not KH_SSO_ENABLED,
             )
 
             if not KH_DEMO_MODE:
diff --git a/libs/ktem/ktem/pages/chat/report.py b/libs/ktem/ktem/pages/chat/report.py
index f40474377..b269f4ef1 100644
--- a/libs/ktem/ktem/pages/chat/report.py
+++ b/libs/ktem/ktem/pages/chat/report.py
@@ -12,7 +12,7 @@ def __init__(self, app):
         self.on_building_ui()
 
     def on_building_ui(self):
-        with gr.Accordion(label="Feedback", open=False):
+        with gr.Accordion(label="Feedback", open=False, elem_id="report-accordion"):
             self.correctness = gr.Radio(
                 choices=[
                     ("The answer is correct", "correct"),