diff --git a/admin-ui/app/components/GluuDropdown/GluuDropdown.style.ts b/admin-ui/app/components/GluuDropdown/GluuDropdown.style.ts
index 039d47fc01..29ca43d3db 100644
--- a/admin-ui/app/components/GluuDropdown/GluuDropdown.style.ts
+++ b/admin-ui/app/components/GluuDropdown/GluuDropdown.style.ts
@@ -35,6 +35,12 @@ const getPositionStyles = (position: DropdownPosition) => {
         marginLeft: SHARED_DROPDOWN_STYLES.margin,
         ...baseTransform,
       }
+    case 'bottom-end':
+      return {
+        top: '100%',
+        marginTop: SHARED_DROPDOWN_STYLES.margin,
+        right: 0,
+      }
     default:
       return {}
   }
@@ -54,6 +60,13 @@ const getArrowStyles = (position: DropdownPosition) => {
         left: '50%',
         transform: 'translateX(-50%)',
       }
+    case 'bottom-end':
+      return {
+        top: 'calc(100% - 2px)',
+        left: '50%',
+        transform: 'translateX(-50%)',
+        zIndex: SHARED_DROPDOWN_STYLES.menuZIndex + 1,
+      }
     case 'left':
       return {
         right: '-15px',
@@ -76,7 +89,8 @@ export const useStyles = makeStyles<{
   position: DropdownPosition
   dropdownBg: string
   centerText?: boolean
-}>()((_theme, { isDark, position, dropdownBg, centerText }) => ({
+  optionPadding?: string
+}>()((_theme, { isDark, position, dropdownBg, centerText, optionPadding }) => ({
   dropdownWrapper: {
     position: 'relative',
     display: 'inline-block',
@@ -93,7 +107,12 @@ export const useStyles = makeStyles<{
     maxHeight: SHARED_DROPDOWN_STYLES.maxHeight,
     overflow: 'visible',
     ...getPositionStyles(position),
-    marginTop: position === 'bottom' ? '13px' : position === 'top' ? undefined : '4px',
+    marginTop:
+      position === 'bottom' || position === 'bottom-end'
+        ? '13px'
+        : position === 'top'
+          ? undefined
+          : '4px',
   },
   dropdownMenuContent: {
     padding: SHARED_DROPDOWN_STYLES.padding,
@@ -140,6 +159,7 @@ export const useStyles = makeStyles<{
     ...createBaseOptionStyles({
       isDark,
       ...(centerText && { optionPadding: '12px 12px' }),
+      ...(optionPadding && { optionPadding }),
     }),
     '&.single-option': {
       justifyContent: 'center',
diff --git a/admin-ui/app/components/GluuDropdown/GluuDropdown.tsx b/admin-ui/app/components/GluuDropdown/GluuDropdown.tsx
index 71bae11080..0a68cf7eaf 100644
--- a/admin-ui/app/components/GluuDropdown/GluuDropdown.tsx
+++ b/admin-ui/app/components/GluuDropdown/GluuDropdown.tsx
@@ -49,6 +49,7 @@ export const GluuDropdown = <T extends DropdownValue = DropdownValue>({
   renderOption,
   renderTrigger,
   centerText = false,
+  optionPadding,
 }: GluuDropdownProps<T>): React.ReactElement => {
   const [internalState, setInternalState] = useState<DropdownState>({
     isOpen: false,
@@ -66,9 +67,10 @@ export const GluuDropdown = <T extends DropdownValue = DropdownValue>({
   const dropdownBg = useMemo(() => {
     return isDark ? customColors.darkDropdownBg : customColors.white
   }, [isDark])
-  const { classes } = useStyles({ isDark, position, dropdownBg, centerText })
+  const { classes } = useStyles({ isDark, position, dropdownBg, centerText, optionPadding })
 
   const isOpen = controlled ? (controlledIsOpen ?? false) : internalState.isOpen
+  const arrowAnchoredToTrigger = position === 'bottom-end'
   const searchQuery = internalState.searchQuery
 
   const setIsOpen = useCallback(
@@ -152,7 +154,7 @@ export const GluuDropdown = <T extends DropdownValue = DropdownValue>({
       option.onClick?.(option.value, option)
       onSelect?.(option.value, option)
 
-      if (closeOnSelect) {
+      if (closeOnSelect && !option.keepOpen) {
         setIsOpen(false)
         setInternalState((prev) => ({ ...prev, searchQuery: '' }))
       }
@@ -269,7 +271,7 @@ export const GluuDropdown = <T extends DropdownValue = DropdownValue>({
           role="listbox"
           id={listboxId}
         >
-          {showArrow && (
+          {showArrow && !arrowAnchoredToTrigger && (
             <div className={classes.arrow}>
               <ArrowIcon />
             </div>
@@ -293,6 +295,11 @@ export const GluuDropdown = <T extends DropdownValue = DropdownValue>({
           </div>
         </Box>
       )}
+      {isOpen && showArrow && arrowAnchoredToTrigger && (
+        <div className={classes.arrow}>
+          <ArrowIcon />
+        </div>
+      )}
     </div>
   )
 }
diff --git a/admin-ui/app/components/GluuDropdown/types/GluuDropdownTypes.ts b/admin-ui/app/components/GluuDropdown/types/GluuDropdownTypes.ts
index 173266000f..3b85482859 100644
--- a/admin-ui/app/components/GluuDropdown/types/GluuDropdownTypes.ts
+++ b/admin-ui/app/components/GluuDropdown/types/GluuDropdownTypes.ts
@@ -1,6 +1,6 @@
 import type React from 'react'
 
-export type DropdownPosition = 'top' | 'bottom' | 'left' | 'right'
+export type DropdownPosition = 'top' | 'bottom' | 'bottom-end' | 'left' | 'right'
 
 export type DropdownValue = string | number | boolean
 
@@ -13,6 +13,7 @@ export type GluuDropdownOption<T extends DropdownValue = DropdownValue> = {
   icon?: React.ReactNode
   metadata?: Record<string, string | number | boolean | null | undefined>
   searchValue?: string
+  keepOpen?: boolean
 }
 
 export type GluuDropdownProps<T extends DropdownValue = DropdownValue> = {
@@ -43,6 +44,7 @@ export type GluuDropdownProps<T extends DropdownValue = DropdownValue> = {
     selectedOption?: GluuDropdownOption<T> | GluuDropdownOption<T>[],
   ) => React.ReactNode
   centerText?: boolean
+  optionPadding?: string
 }
 
 export type DropdownState = {
diff --git a/admin-ui/app/locales/en/translation.json b/admin-ui/app/locales/en/translation.json
index c33ede182b..9ae232e17d 100644
--- a/admin-ui/app/locales/en/translation.json
+++ b/admin-ui/app/locales/en/translation.json
@@ -759,6 +759,7 @@
     "platform": "Platform",
     "authType": "Auth Type",
     "showCedarLogs?": "Cedarling Log enabled?",
+    "cedarlingLogs?": "Cedarling logs?",
     "reloginToViewCedarlingChanges": "Please Re-login to view the cedarling changes.",
     "allAvailableHintsSelected": "All available hint options are selected",
     "noMatchingOptions": "No matching options",
diff --git a/admin-ui/app/locales/es/translation.json b/admin-ui/app/locales/es/translation.json
index 6294fa8f95..1efd331d32 100644
--- a/admin-ui/app/locales/es/translation.json
+++ b/admin-ui/app/locales/es/translation.json
@@ -721,6 +721,7 @@
     "platform": "Plataforma",
     "authType": "Tipo de Autenticación",
     "showCedarLogs?": "¿Registro de Cedarling habilitado?",
+    "cedarlingLogs?": "¿Registros de Cedarling?",
     "reloginToViewCedarlingChanges": "Por favor, vuelve a iniciar sesión para ver los cambios de Cedarling.",
     "allAvailableHintsSelected": "Todas las opciones de sugerencia disponibles están seleccionadas",
     "noMatchingOptions": "No hay opciones coincidentes",
diff --git a/admin-ui/app/locales/fr/translation.json b/admin-ui/app/locales/fr/translation.json
index 39afb9b62c..53e7b56809 100644
--- a/admin-ui/app/locales/fr/translation.json
+++ b/admin-ui/app/locales/fr/translation.json
@@ -842,6 +842,7 @@
     "platform": "Plateforme",
     "authType": "Type d'authentification",
     "showCedarLogs?": "Cedarling Log est-il activé?",
+    "cedarlingLogs?": "Journaux Cedarling ?",
     "reloginToViewCedarlingChanges": "Veuillez vous reconnecter pour voir les modifications de cedarling.",
     "allAvailableHintsSelected": "Toutes les options d'indice disponibles sont sélectionnées.",
     "noMatchingOptions": "Aucune option correspondante",
diff --git a/admin-ui/app/locales/pt/translation.json b/admin-ui/app/locales/pt/translation.json
index 99661ec6ef..a53d9592bd 100644
--- a/admin-ui/app/locales/pt/translation.json
+++ b/admin-ui/app/locales/pt/translation.json
@@ -798,6 +798,7 @@
     "platform": "Plataforma",
     "authType": "Tipo de autenticação",
     "showCedarLogs?": "O Cedarling Log está habilitado?",
+    "cedarlingLogs?": "Logs do Cedarling?",
     "reloginToViewCedarlingChanges": "Por favor, faça login novamente para ver as alterações do cedarling.",
     "allAvailableHintsSelected": "Todas as opções de dica disponíveis estão selecionadas",
     "noMatchingOptions": "Nenhuma opção correspondente",
diff --git a/admin-ui/app/routes/Apps/Gluu/GluuNavBar.tsx b/admin-ui/app/routes/Apps/Gluu/GluuNavBar.tsx
index d116c36b06..12a1762af7 100755
--- a/admin-ui/app/routes/Apps/Gluu/GluuNavBar.tsx
+++ b/admin-ui/app/routes/Apps/Gluu/GluuNavBar.tsx
@@ -151,7 +151,7 @@ const GluuNavBar = () => {
                   </Box>
                 </Box>
               )}
-              position="bottom"
+              position="bottom-end"
             />
           )}
         </Box>
diff --git a/admin-ui/app/routes/Apps/Gluu/GluuToggle.tsx b/admin-ui/app/routes/Apps/Gluu/GluuToggle.tsx
index 2c7544af0a..b42fcf847b 100644
--- a/admin-ui/app/routes/Apps/Gluu/GluuToggle.tsx
+++ b/admin-ui/app/routes/Apps/Gluu/GluuToggle.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react'
 import type { ChangeEvent } from 'react'
 import clsx from 'clsx'
+import customColors from '@/customColors'
 import type { JsonValue } from './types/common'
 import type { GluuToggleProps } from './types/GluuToggle.types'
 import { useStyles } from './styles/GluuToggle.style'
@@ -39,7 +40,7 @@ const GluuToggle = <T = Record<string, JsonValue>,>({
             <svg width="14" height="11" viewBox="0 0 14 11">
               <path
                 d="M11.264 0L5.26 6.004 2.103 2.847 0 4.95l5.26 5.26 8.108-8.107L11.264 0"
-                fill="#fff"
+                fill={customColors.white}
                 fillRule="evenodd"
               />
             </svg>
@@ -48,7 +49,7 @@ const GluuToggle = <T = Record<string, JsonValue>,>({
             <svg width="10" height="10" viewBox="0 0 10 10">
               <path
                 d="M9.9 2.12L7.78 0 4.95 2.828 2.12 0 0 2.12l2.83 2.83L0 7.776 2.123 9.9 4.95 7.07 7.78 9.9 9.9 7.776 7.072 4.95 9.9 2.12"
-                fill="#fff"
+                fill={customColors.white}
                 fillRule="evenodd"
               />
             </svg>
diff --git a/admin-ui/app/routes/Apps/Gluu/__tests__/GluuNavBar.test.tsx b/admin-ui/app/routes/Apps/Gluu/__tests__/GluuNavBar.test.tsx
index 4f9c5d6e80..561311d513 100644
--- a/admin-ui/app/routes/Apps/Gluu/__tests__/GluuNavBar.test.tsx
+++ b/admin-ui/app/routes/Apps/Gluu/__tests__/GluuNavBar.test.tsx
@@ -15,6 +15,10 @@ const createTestStore = (userinfo: UserInfo | null): Store =>
     }),
   })
 
+jest.mock('@/utils/hooks/useCedarlingLogToggle', () => ({
+  useCedarlingLogToggle: () => ({ enabled: false, toggle: jest.fn(), isSaving: false }),
+}))
+
 const renderNavBar = (userinfo: UserInfo | null) => {
   const store = createTestStore(userinfo)
   const Wrapper = ({ children }: { children: ReactNode }) => (
diff --git a/admin-ui/app/routes/components/Dropdowns/DropdownProfile.tsx b/admin-ui/app/routes/components/Dropdowns/DropdownProfile.tsx
index a1b600d0d5..9bc9550e00 100755
--- a/admin-ui/app/routes/components/Dropdowns/DropdownProfile.tsx
+++ b/admin-ui/app/routes/components/Dropdowns/DropdownProfile.tsx
@@ -5,12 +5,16 @@ import { useAppNavigation, ROUTES } from '@/helpers/navigation'
 import { auditLogoutLogs } from 'Redux/features/sessionSlice'
 import { MANUAL_LOGOUT } from '@/audit/messages'
 import { GluuDropdown, type GluuDropdownOption } from 'Components'
+import Box from '@mui/material/Box'
+import Switch from '@mui/material/Switch'
+import { useCedarlingLogToggle } from '@/utils/hooks/useCedarlingLogToggle'
 import type { DropdownProfileProps } from './types'
 
 const DropdownProfile = ({ trigger, renderTrigger, position = 'bottom' }: DropdownProfileProps) => {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
   const { navigateToRoute } = useAppNavigation()
+  const { enabled: cedarLogsEnabled, toggle: toggleCedarLogs } = useCedarlingLogToggle()
 
   const handleLogout = useCallback(() => {
     dispatch(auditLogoutLogs({ message: MANUAL_LOGOUT }))
@@ -25,6 +29,33 @@ const DropdownProfile = ({ trigger, renderTrigger, position = 'bottom' }: Dropdo
           navigateToRoute(ROUTES.PROFILE)
         },
       },
+      {
+        value: 'cedarLogs',
+        label: (
+          <Box
+            sx={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'space-between',
+              flex: 1,
+              gap: 2,
+              whiteSpace: 'nowrap',
+            }}
+          >
+            {t('fields.cedarlingLogs?')}
+            <Switch
+              size="small"
+              checked={cedarLogsEnabled}
+              slotProps={{ input: { 'aria-label': t('fields.cedarlingLogs?') } }}
+            />
+          </Box>
+        ),
+        searchValue: t('fields.cedarlingLogs?'),
+        keepOpen: true,
+        onClick: () => {
+          toggleCedarLogs()
+        },
+      },
       {
         value: 'logout',
         label: t('menus.signout'),
@@ -33,7 +64,7 @@ const DropdownProfile = ({ trigger, renderTrigger, position = 'bottom' }: Dropdo
         },
       },
     ],
-    [t, navigateToRoute, handleLogout],
+    [t, navigateToRoute, handleLogout, cedarLogsEnabled, toggleCedarLogs],
   )
 
   return (
@@ -43,6 +74,7 @@ const DropdownProfile = ({ trigger, renderTrigger, position = 'bottom' }: Dropdo
       options={options}
       position={position}
       minWidth={182}
+      optionPadding="12px"
       showArrow={true}
     />
   )
diff --git a/admin-ui/app/routes/components/Dropdowns/MobileProfileDropdown.tsx b/admin-ui/app/routes/components/Dropdowns/MobileProfileDropdown.tsx
index 1a2815040b..7eded657b8 100644
--- a/admin-ui/app/routes/components/Dropdowns/MobileProfileDropdown.tsx
+++ b/admin-ui/app/routes/components/Dropdowns/MobileProfileDropdown.tsx
@@ -19,6 +19,8 @@ import { THEME_LIGHT, THEME_DARK } from '@/context/theme/constants'
 import { useThemePersistence } from '@/hooks/useThemePersistence'
 import { useLangPersistence } from '@/hooks/useLangPersistence'
 import { LANG_CODES, DEFAULT_LANG } from '@/constants'
+import Switch from '@mui/material/Switch'
+import { useCedarlingLogToggle } from '@/utils/hooks/useCedarlingLogToggle'
 import { useStyles } from './styles/MobileProfileDropdown.style'
 import type { MobileProfileDropdownProps } from './types'
 
@@ -89,6 +91,8 @@ const MobileProfileDropdown = ({ userInfo, renderTrigger }: MobileProfileDropdow
 
   const onChangeTheme = useThemePersistence(userInfo)
 
+  const { enabled: cedarLogsEnabled, toggle: toggleCedarLogs } = useCedarlingLogToggle()
+
   const handleProfile = useCallback(() => {
     setIsOpen(false)
     navigateToRoute(ROUTES.PROFILE)
@@ -219,6 +223,20 @@ const MobileProfileDropdown = ({ userInfo, renderTrigger }: MobileProfileDropdow
             />
           </div>
 
+          <hr className={classes.divider} />
+
+          <div className={classes.row}>
+            <GluuText variant="span" className={classes.rowLabel}>
+              {t('fields.cedarlingLogs?')}
+            </GluuText>
+            <Switch
+              size="small"
+              checked={cedarLogsEnabled}
+              onChange={toggleCedarLogs}
+              slotProps={{ input: { 'aria-label': t('fields.cedarlingLogs?') } }}
+            />
+          </div>
+
           <button type="button" className={classes.signOut} onClick={handleLogout}>
             <GluuText variant="span" className={classes.signOutText}>
               {t('menus.signout')}
diff --git a/admin-ui/app/routes/components/Dropdowns/__tests__/DropdownProfile.test.tsx b/admin-ui/app/routes/components/Dropdowns/__tests__/DropdownProfile.test.tsx
index 58be5f0372..41c7587af0 100644
--- a/admin-ui/app/routes/components/Dropdowns/__tests__/DropdownProfile.test.tsx
+++ b/admin-ui/app/routes/components/Dropdowns/__tests__/DropdownProfile.test.tsx
@@ -7,6 +7,16 @@ import { DropdownProfile } from '../DropdownProfile'
 import sessionReducer, { auditLogoutLogs } from 'Redux/features/sessionSlice'
 import { ROUTES } from '@/helpers/navigation'
 
+const mockToggleCedarLogs = jest.fn()
+
+jest.mock('@/utils/hooks/useCedarlingLogToggle', () => ({
+  useCedarlingLogToggle: () => ({
+    enabled: false,
+    toggle: mockToggleCedarLogs,
+    isSaving: false,
+  }),
+}))
+
 const mockNavigateToRoute = jest.fn()
 
 jest.mock('@/helpers/navigation', () => ({
@@ -40,6 +50,7 @@ const openMenu = () => fireEvent.click(screen.getByText('Account'))
 describe('DropdownProfile', () => {
   beforeEach(() => {
     mockNavigateToRoute.mockClear()
+    mockToggleCedarLogs.mockClear()
   })
 
   it('renders the trigger', () => {
@@ -61,6 +72,27 @@ describe('DropdownProfile', () => {
     expect(mockNavigateToRoute).toHaveBeenCalledWith(ROUTES.PROFILE)
   })
 
+  it('toggles cedarling logs once when the option is activated', () => {
+    renderProfile()
+    openMenu()
+    fireEvent.click(screen.getByRole('switch', { name: i18n.t('fields.cedarlingLogs?') }))
+    expect(mockToggleCedarLogs).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps the menu open after cedarling logs is toggled', () => {
+    renderProfile()
+    openMenu()
+    fireEvent.click(screen.getByRole('switch', { name: i18n.t('fields.cedarlingLogs?') }))
+    expect(screen.getByText(i18n.t('menus.signout'))).toBeInTheDocument()
+  })
+
+  it('closes the menu after sign out is clicked', () => {
+    renderProfile()
+    openMenu()
+    fireEvent.click(screen.getByText(i18n.t('menus.signout')))
+    expect(screen.queryByText(i18n.t('menus.my_profile'))).not.toBeInTheDocument()
+  })
+
   it('dispatches a logout audit when sign out is clicked', () => {
     const { dispatchSpy } = renderProfile()
     openMenu()
diff --git a/admin-ui/app/routes/components/Dropdowns/__tests__/MobileProfileDropdown.test.tsx b/admin-ui/app/routes/components/Dropdowns/__tests__/MobileProfileDropdown.test.tsx
new file mode 100644
index 0000000000..3be81a588f
--- /dev/null
+++ b/admin-ui/app/routes/components/Dropdowns/__tests__/MobileProfileDropdown.test.tsx
@@ -0,0 +1,111 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import { Provider } from 'react-redux'
+import { configureStore, combineReducers } from '@reduxjs/toolkit'
+import { I18nextProvider } from 'react-i18next'
+import i18n from '@/i18n'
+import { ThemeContext } from '@/context/theme/themeContext'
+import type { ThemeContextType } from '@/context/theme/themeContext'
+import { THEME_LIGHT } from '@/context/theme/constants'
+import { MobileProfileDropdown } from '../MobileProfileDropdown'
+import sessionReducer, { auditLogoutLogs } from 'Redux/features/sessionSlice'
+import { ROUTES } from '@/helpers/navigation'
+
+const mockToggleCedarLogs = jest.fn()
+
+jest.mock('@/utils/hooks/useCedarlingLogToggle', () => ({
+  useCedarlingLogToggle: () => ({
+    enabled: false,
+    toggle: mockToggleCedarLogs,
+    isSaving: false,
+  }),
+}))
+
+const mockNavigateToRoute = jest.fn()
+
+jest.mock('@/helpers/navigation', () => ({
+  ...jest.requireActual('@/helpers/navigation'),
+  useAppNavigation: () => ({ navigateToRoute: mockNavigateToRoute }),
+}))
+
+jest.mock('@/hooks/useThemePersistence', () => ({
+  useThemePersistence: () => jest.fn(),
+}))
+
+jest.mock('@/hooks/useLangPersistence', () => ({
+  useLangPersistence: () => ({ lang: 'en', changeLanguage: jest.fn() }),
+}))
+
+const makeStore = () =>
+  configureStore({
+    reducer: combineReducers({ sessionReducer }),
+    preloadedState: { sessionReducer: { landingPath: null, logoutRequested: false } },
+  })
+
+const themeValue: ThemeContextType = {
+  state: { theme: THEME_LIGHT },
+  dispatch: jest.fn(),
+}
+
+const renderMobileProfile = (store = makeStore()) => {
+  const dispatchSpy = jest.spyOn(store, 'dispatch')
+  return {
+    store,
+    dispatchSpy,
+    ...render(
+      <Provider store={store}>
+        <I18nextProvider i18n={i18n}>
+          <ThemeContext.Provider value={themeValue}>
+            <MobileProfileDropdown
+              userInfo={{ inum: 'test-inum' } as never}
+              renderTrigger={() => <span>Account</span>}
+            />
+          </ThemeContext.Provider>
+        </I18nextProvider>
+      </Provider>,
+    ),
+  }
+}
+
+const openMenu = () => fireEvent.click(screen.getByText('Account'))
+
+describe('MobileProfileDropdown', () => {
+  beforeEach(() => {
+    mockNavigateToRoute.mockClear()
+    mockToggleCedarLogs.mockClear()
+  })
+
+  it('renders the trigger', () => {
+    renderMobileProfile()
+    expect(screen.getByText('Account')).toBeInTheDocument()
+  })
+
+  it('shows profile and sign-out rows when opened', () => {
+    renderMobileProfile()
+    openMenu()
+    expect(screen.getByText(i18n.t('menus.my_profile'))).toBeInTheDocument()
+    expect(screen.getByText(i18n.t('menus.signout'))).toBeInTheDocument()
+  })
+
+  it('navigates to the profile route when "my profile" is clicked', () => {
+    renderMobileProfile()
+    openMenu()
+    fireEvent.click(screen.getByText(i18n.t('menus.my_profile')))
+    expect(mockNavigateToRoute).toHaveBeenCalledWith(ROUTES.PROFILE)
+  })
+
+  it('toggles cedarling logs once when the switch is changed', () => {
+    renderMobileProfile()
+    openMenu()
+    fireEvent.click(screen.getByRole('switch', { name: i18n.t('fields.cedarlingLogs?') }))
+    expect(mockToggleCedarLogs).toHaveBeenCalledTimes(1)
+  })
+
+  it('dispatches a logout audit when sign out is clicked', () => {
+    const { dispatchSpy } = renderMobileProfile()
+    openMenu()
+    fireEvent.click(screen.getByText(i18n.t('menus.signout')))
+    expect(dispatchSpy).toHaveBeenCalledWith(
+      auditLogoutLogs({ message: 'User logged out manually' }),
+    )
+  })
+})
diff --git a/admin-ui/app/utils/hooks/useCedarlingLogToggle.ts b/admin-ui/app/utils/hooks/useCedarlingLogToggle.ts
new file mode 100644
index 0000000000..1bc302eaae
--- /dev/null
+++ b/admin-ui/app/utils/hooks/useCedarlingLogToggle.ts
@@ -0,0 +1,80 @@
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useQueryClient } from '@tanstack/react-query'
+import {
+  useGetAdminuiConf,
+  useEditAdminuiConf,
+  getGetAdminuiConfQueryKey,
+  type AppConfigResponse,
+} from 'JansConfigApi'
+import { useAppDispatch } from '@/redux/hooks'
+import { updateToast } from '@/redux/features/toastSlice'
+import { getOAuth2ConfigResponse } from '@/redux/features/authSlice'
+import type { Config } from '@/redux/features/types/authTypes'
+import { CEDARLING_LOG_TYPE } from '@/cedarling/constants'
+import { getErrorMessage } from '@/utils/errorHandler'
+
+type UseCedarlingLogToggle = {
+  enabled: boolean
+  toggle: () => void
+  isSaving: boolean
+}
+
+export const useCedarlingLogToggle = (): UseCedarlingLogToggle => {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const queryClient = useQueryClient()
+
+  const { data: config } = useGetAdminuiConf()
+  const editConfigMutation = useEditAdminuiConf()
+
+  const [optimisticEnabled, setOptimisticEnabled] = useState<boolean | null>(null)
+
+  const serverEnabled = useMemo(
+    () => config?.cedarlingLogType === CEDARLING_LOG_TYPE.STD_OUT,
+    [config?.cedarlingLogType],
+  )
+
+  const enabled = optimisticEnabled ?? serverEnabled
+
+  const toggle = useCallback(() => {
+    if (editConfigMutation.isPending) return
+
+    const nextEnabled = !enabled
+
+    const updatePayload: AppConfigResponse = {
+      sessionTimeoutInMins: config?.sessionTimeoutInMins || undefined,
+      acrValues: config?.acrValues,
+      additionalParameters: config?.additionalParameters,
+      cedarlingLogType: nextEnabled ? CEDARLING_LOG_TYPE.STD_OUT : CEDARLING_LOG_TYPE.OFF,
+    }
+
+    setOptimisticEnabled(nextEnabled)
+
+    editConfigMutation.mutate(
+      { data: updatePayload },
+      {
+        onSuccess: (updatedConfig) => {
+          queryClient.setQueryData(getGetAdminuiConfQueryKey(), updatedConfig)
+          setOptimisticEnabled(null)
+          queryClient.invalidateQueries({ queryKey: getGetAdminuiConfQueryKey() })
+          dispatch(getOAuth2ConfigResponse({ config: updatedConfig as Config }))
+          dispatch(updateToast(true, 'success', t('fields.reloginToViewCedarlingChanges')))
+        },
+        onError: (error) => {
+          setOptimisticEnabled(null)
+          const normalizedError = error instanceof Error ? error : new Error(String(error))
+          dispatch(
+            updateToast(
+              true,
+              'error',
+              getErrorMessage(normalizedError, 'messages.error_in_saving', t),
+            ),
+          )
+        },
+      },
+    )
+  }, [config, enabled, editConfigMutation, queryClient, dispatch, t])
+
+  return { enabled, toggle, isSaving: editConfigMutation.isPending }
+}
diff --git a/admin-ui/plugins/admin/__tests__/components/Settings/SettingsPage.test.tsx b/admin-ui/plugins/admin/__tests__/components/Settings/SettingsPage.test.tsx
index 71d57e3c33..41b3524376 100644
--- a/admin-ui/plugins/admin/__tests__/components/Settings/SettingsPage.test.tsx
+++ b/admin-ui/plugins/admin/__tests__/components/Settings/SettingsPage.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { render, screen } from '@testing-library/react'
+import { render, screen, fireEvent } from '@testing-library/react'
 import { Provider } from 'react-redux'
 import { combineReducers, configureStore } from '@reduxjs/toolkit'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
@@ -18,11 +18,20 @@ jest.mock('@/cedarling', () => ({
   CEDAR_RESOURCE_SCOPES: { settings: [] },
 }))
 
+const mockUsePermission = jest.fn(() => ({ canRead: true, canWrite: true, canDelete: true }))
+
+jest.mock('@/cedarling/hooks/usePermission', () => ({
+  usePermission: () => mockUsePermission(),
+}))
+
 jest.mock('@/cedarling/utility', () => ({
   ADMIN_UI_RESOURCES: { Settings: 'settings' },
   CEDAR_RESOURCE_SCOPES: { settings: [] },
+  buildCedarPermissionKey: (resource: string, action: string) => `${resource}::${action}`,
 }))
 
+const mockMutateAsync = jest.fn()
+
 jest.mock('JansConfigApi', () => ({
   useGetAdminuiConf: jest.fn(() => ({
     data: { auiConfiguration: { listPagingSize: 10, maxCount: 200 } },
@@ -30,7 +39,7 @@ jest.mock('JansConfigApi', () => ({
     isFetching: false,
     isLoading: false,
   })),
-  useEditAdminuiConf: jest.fn(() => ({ mutateAsync: jest.fn() })),
+  useEditAdminuiConf: jest.fn(() => ({ mutateAsync: mockMutateAsync })),
   useGetConfigScriptsByType: jest.fn(() => ({
     data: { entries: [] },
     isLoading: false,
@@ -50,6 +59,9 @@ const store = configureStore({
         config: { clientId: '123', configApiBaseUrl: 'https://example.com' },
       },
     ) => state,
+    cedarPermissions: (
+      state = { permissions: { 'settings::read': true, 'settings::write': true } },
+    ) => state,
     noReducer: (state = {}) => state,
   }),
 })
@@ -58,6 +70,28 @@ const queryClient = new QueryClient({
   defaultOptions: { queries: { retry: false } },
 })
 
+const makeWrapper = (permissions: Record<string, boolean>) => {
+  const scopedStore = configureStore({
+    reducer: combineReducers({
+      authReducer: (
+        state = {
+          userinfo: { name: 'Test User' },
+          config: { clientId: '123', configApiBaseUrl: 'https://example.com' },
+        },
+      ) => state,
+      cedarPermissions: (state = { permissions }) => state,
+      noReducer: (state = {}) => state,
+    }),
+  })
+  return ({ children }: { children: React.ReactNode }) => (
+    <QueryClientProvider client={queryClient}>
+      <AppTestWrapper>
+        <Provider store={scopedStore}>{children}</Provider>
+      </AppTestWrapper>
+    </QueryClientProvider>
+  )
+}
+
 const Wrapper = ({ children }: { children: React.ReactNode }) => (
   <QueryClientProvider client={queryClient}>
     <AppTestWrapper>
@@ -98,3 +132,55 @@ it('Should list installed agama project flows in the ACR dropdown', async () =>
   ).toBeInTheDocument()
   expect(screen.queryByRole('option', { name: /agama_org\.gluu\.agama\.hidden/ })).toBeNull()
 })
+
+describe('read-only access', () => {
+  beforeEach(() => {
+    mockMutateAsync.mockClear()
+    mockUsePermission.mockReturnValue({ canRead: true, canWrite: false, canDelete: false })
+  })
+
+  afterEach(() => {
+    mockUsePermission.mockReturnValue({ canRead: true, canWrite: true, canDelete: true })
+  })
+
+  it('does not submit when the role lacks Settings write', async () => {
+    const { container } = render(<SettingsPage />, { wrapper: Wrapper })
+    await screen.findByText(/List paging size/)
+
+    const form = container.querySelector('form')
+    expect(form).not.toBeNull()
+    fireEvent.submit(form as HTMLFormElement)
+
+    expect(mockMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it('disables the editable fields when the role lacks Settings write', async () => {
+    const { container } = render(<SettingsPage />, { wrapper: Wrapper })
+    await screen.findByText(/List paging size/)
+
+    const sessionTimeout = container.querySelector('input[name="sessionTimeoutInMins"]')
+    expect(sessionTimeout).toBeDisabled()
+  })
+})
+
+it('shows a loader instead of a permission error while the decision is pending', async () => {
+  mockUsePermission.mockReturnValue({ canRead: false, canWrite: false, canDelete: false })
+
+  render(<SettingsPage />, { wrapper: makeWrapper({}) })
+
+  expect(screen.queryByTestId('MISSING')).toBeNull()
+
+  mockUsePermission.mockReturnValue({ canRead: true, canWrite: true, canDelete: true })
+})
+
+it('shows the permission error once the decision resolves to denied', async () => {
+  mockUsePermission.mockReturnValue({ canRead: false, canWrite: false, canDelete: false })
+
+  render(<SettingsPage />, {
+    wrapper: makeWrapper({ 'settings::read': false, 'settings::write': false }),
+  })
+
+  expect(await screen.findByTestId('MISSING')).toBeInTheDocument()
+
+  mockUsePermission.mockReturnValue({ canRead: true, canWrite: true, canDelete: true })
+})
diff --git a/admin-ui/plugins/admin/components/Settings/SettingsPage.tsx b/admin-ui/plugins/admin/components/Settings/SettingsPage.tsx
index e329afd230..782c76d18a 100644
--- a/admin-ui/plugins/admin/components/Settings/SettingsPage.tsx
+++ b/admin-ui/plugins/admin/components/Settings/SettingsPage.tsx
@@ -11,6 +11,9 @@ import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
 import GluuText from 'Routes/Apps/Gluu/GluuText'
 import GluuThemeFormFooter from '@/routes/Apps/Gluu/GluuThemeFormFooter'
 import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
+import { usePermission } from '@/cedarling/hooks/usePermission'
+import { ADMIN_UI_RESOURCES, buildCedarPermissionKey } from '@/cedarling/utility'
+import { CEDAR_ACTIONS } from '@/cedarling/constants'
 import { SETTINGS } from 'Utils/ApiResources'
 import { getFieldPlaceholder } from '@/utils/placeholderUtils'
 import SetTitle from 'Utils/SetTitle'
@@ -70,6 +73,23 @@ const SettingsPage: React.FC = () => {
 
   const isMobile = useMediaQuery(MOBILE_MEDIA_QUERY)
 
+  const { canRead: canReadSettings, canWrite: canWriteSettings } = usePermission(
+    ADMIN_UI_RESOURCES.Settings,
+  )
+
+  const settingsDecisions = useAppSelector((state) => state.cedarPermissions?.permissions)
+  const settingsReadResolved =
+    settingsDecisions?.[
+      buildCedarPermissionKey(ADMIN_UI_RESOURCES.Settings, CEDAR_ACTIONS.READ)
+    ] !== undefined
+  const settingsWriteResolved =
+    settingsDecisions?.[
+      buildCedarPermissionKey(ADMIN_UI_RESOURCES.Settings, CEDAR_ACTIONS.WRITE)
+    ] !== undefined
+  const settingsPermissionResolved = settingsReadResolved && settingsWriteResolved
+  const canShowSettings = settingsPermissionResolved ? canReadSettings : null
+  const isSettingsEditable = settingsPermissionResolved && canWriteSettings
+
   const userinfo = useAppSelector((state) => state.authReducer?.userinfo)
   const clientId = useAppSelector((state) => state.authReducer?.config?.clientId)
 
@@ -150,6 +170,8 @@ const SettingsPage: React.FC = () => {
     initialValues,
     enableReinitialize: true,
     onSubmit: async (values, formikHelpers) => {
+      if (!isSettingsEditable) return
+
       savePagingSizeToStorage(currentPagingSize)
       saveLogLevel(currentLogLevel)
 
@@ -345,7 +367,7 @@ const SettingsPage: React.FC = () => {
 
   return (
     <GluuLoader blocking={loadingScripts || loadingConfig || loadingAgamaProjects || isSubmitting}>
-      <GluuViewWrapper canShow>
+      <GluuViewWrapper canShow={canShowSettings}>
         <GluuPageContent>
           <div className={classes.mobileContentPad}>
             <GluuText variant="h1" className={classes.mobilePageTitle}>
@@ -397,7 +419,7 @@ const SettingsPage: React.FC = () => {
                         rsize={12}
                         doc_category={SETTINGS}
                         doc_entry="pageSize"
-                        disabled={isMobile}
+                        disabled={isMobile || !isSettingsEditable}
                         isDark={isDark}
                         reserveErrorSpace
                         handleChange={(e) => {
@@ -418,7 +440,7 @@ const SettingsPage: React.FC = () => {
                         rsize={12}
                         doc_category={SETTINGS}
                         doc_entry="logLevel"
-                        disabled={isMobile}
+                        disabled={isMobile || !isSettingsEditable}
                         isDark={isDark}
                         hideChooseOption
                         reserveErrorSpace
@@ -439,7 +461,7 @@ const SettingsPage: React.FC = () => {
                         doc_entry="sessionTimeoutInMins"
                         errorMessage={formik.errors.sessionTimeoutInMins}
                         showError={Boolean(formik.errors.sessionTimeoutInMins)}
-                        disabled={isMobile}
+                        disabled={isMobile || !isSettingsEditable}
                         isDark={isDark}
                         placeholder={getFieldPlaceholder(t, 'fields.sessionTimeoutInMins')}
                       />
@@ -456,7 +478,7 @@ const SettingsPage: React.FC = () => {
                         rsize={12}
                         doc_category={SETTINGS}
                         doc_entry="adminui_default_acr"
-                        disabled={isMobile}
+                        disabled={isMobile || !isSettingsEditable}
                         isDark={isDark}
                         reserveErrorSpace
                       />
@@ -481,7 +503,7 @@ const SettingsPage: React.FC = () => {
                           doc_entry="cedarSwitch"
                           lsize={12}
                           rsize={12}
-                          disabled={isMobile}
+                          disabled={isMobile || !isSettingsEditable}
                           isDark={isDark}
                           handler={(event: React.ChangeEvent<HTMLInputElement>) => {
                             formik.setFieldValue(
@@ -501,8 +523,8 @@ const SettingsPage: React.FC = () => {
                     title={t('fields.custom_params_auth')}
                     items={additionalParameters}
                     mode="pair"
-                    disabled={isMobile}
-                    hideControls={isMobile}
+                    disabled={isMobile || !isSettingsEditable}
+                    hideControls={isMobile || !isSettingsEditable}
                     emptyStateText={t('messages.no_custom_parameters')}
                     keyPlaceholder={t('placeholders.enter_property_key')}
                     valuePlaceholder={t('placeholders.enter_property_value')}
@@ -518,10 +540,10 @@ const SettingsPage: React.FC = () => {
 
                   <GluuThemeFormFooter
                     showBack
-                    showCancel={!isMobile}
+                    showCancel={!isMobile && isSettingsEditable}
                     onCancel={handleCancel}
                     disableCancel={!isFormChanged}
-                    showApply={!isMobile}
+                    showApply={!isMobile && isSettingsEditable}
                     onApply={formik.handleSubmit}
                     disableApply={!isFormChanged || hasErrors || isSubmitting}
                     applyButtonType="button"
diff --git a/admin-ui/plugins/admin/plugin-metadata.ts b/admin-ui/plugins/admin/plugin-metadata.ts
index a6416c2ead..36125d27cf 100644
--- a/admin-ui/plugins/admin/plugin-metadata.ts
+++ b/admin-ui/plugins/admin/plugin-metadata.ts
@@ -65,7 +65,7 @@ const pluginMetadata = {
           title: 'menus.settings',
           path: ROUTES.ADMIN_SETTINGS,
           action: CEDAR_ACTIONS.READ,
-          resourceKey: CEDARLING_BYPASS,
+          resourceKey: ADMIN_UI_RESOURCES.Settings,
         },
         {
           title: 'menus.security',
@@ -129,7 +129,7 @@ const pluginMetadata = {
       component: SettingsPage,
       path: ROUTES.ADMIN_SETTINGS,
       action: CEDAR_ACTIONS.READ,
-      resourceKey: CEDARLING_BYPASS,
+      resourceKey: ADMIN_UI_RESOURCES.Settings,
     },
 
     {