diff --git a/packages/ui/src/proposals/components/ProposalDiscussions.tsx b/packages/ui/src/proposals/components/ProposalDiscussions.tsx
index b5bd522161..bddf3465d9 100644
--- a/packages/ui/src/proposals/components/ProposalDiscussions.tsx
+++ b/packages/ui/src/proposals/components/ProposalDiscussions.tsx
@@ -25,17 +25,21 @@ interface Props {
   proposalId: string
 }
 
+const hints = {
+  open: 'This is an unmoderated discussioon, everyone can comment.',
+  closed: 'This discussion is closed. Only selected members and the council can comment.',
+}
+
 export const ProposalDiscussions = ({ thread, proposalId }: Props) => {
   const query = useRouteQuery()
   const { api } = useApi()
   const { active, members } = useMyMemberships()
 
   const initialPost = query.get('post')
-  const isAbleToPost =
-    thread.mode === 'open' ||
-    (thread.mode === 'closed' && active && (thread.whitelistIds?.includes(active.id) || active.isCouncilMember))
-  const isInWhitelist = thread.mode === 'closed' && members.find((member) => thread.whitelistIds?.includes(member.id))
-  const hasCouncilMembership = thread.mode === 'closed' && members.find((member) => member.isCouncilMember)
+  const isClosed = thread.mode === 'closed'
+  const isAbleToPost = !isClosed || (active && (thread.whitelistIds?.includes(active.id) || active.isCouncilMember))
+  const whitelistedMember = isClosed ? members.find((member) => thread.whitelistIds?.includes(member.id)) : null
+  const hasCouncilMembership = isClosed && members.find((member) => member.isCouncilMember)
 
   const newPostRef = useRef<HTMLDivElement>(null)
   const postsRefs: AnyKeys = {}
@@ -66,14 +70,15 @@ export const ProposalDiscussions = ({ thread, proposalId }: Props) => {
       return <TextBig>Please select your council membership to post in this thread.</TextBig>
     }
 
-    if (isInWhitelist) {
-      return <TextBig>Please select a whitelisted membership to post in this thread.</TextBig>
+    if (whitelistedMember) {
+      return <TextBig>Please select your other membership to post in this thread: {whitelistedMember.handle}</TextBig>
     }
 
     return (
-      <TextBig>
-        The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.
-      </TextBig>
+      <>
+        <TextBig>The discussion is limited to following whitelisted members:</TextBig>
+        {thread.whitelistIds?.join(' ') ?? ''}
+      </>
     )
   }
 
@@ -83,7 +88,7 @@ export const ProposalDiscussions = ({ thread, proposalId }: Props) => {
         <h4>Discussion</h4>
         <Badge>
           {`${thread.mode} `}
-          <Tooltip tooltipText="Dolore magna anim eu nisi qui.">
+          <Tooltip tooltipText={hints[thread.mode]}>
             <TooltipDefault />
           </Tooltip>
         </Badge>
diff --git a/packages/ui/test/proposals/components/ProposalDiscussion.test.tsx b/packages/ui/test/proposals/components/ProposalDiscussion.test.tsx
index fc2dc47921..4d954bd1dd 100644
--- a/packages/ui/test/proposals/components/ProposalDiscussion.test.tsx
+++ b/packages/ui/test/proposals/components/ProposalDiscussion.test.tsx
@@ -15,9 +15,17 @@ import { getMember } from '../../_mocks/members'
 import { MockKeyringProvider } from '../../_mocks/providers'
 import { stubApi, stubTransaction } from '../../_mocks/transactions'
 
-jest.mock('@/common/components/CKEditor', () => ({
-  BaseCKEditor: (props: CKEditorProps) => mockCKEditor(props),
-}))
+jest.mock('@/common/components/CKEditor', () => {
+  return {
+    BaseCKEditor: (props: CKEditorProps) => mockCKEditor(props),
+  }
+})
+
+const strings = {
+  isClosed: 'The discussion is limited to following whitelisted members:',
+  selectCouncilor: 'Please select your council membership to post in this thread.',
+  selectWhitelisted: 'Please select your other membership to post in this thread:',
+}
 
 describe('UI: Proposal discussion', () => {
   const api = stubApi()
@@ -52,46 +60,35 @@ describe('UI: Proposal discussion', () => {
     it('Non-whitelisted member', async () => {
       useMyMemberships.setActive(alice)
       renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['111', '13'] })
-      expect(
-        await screen.findByText(
-          'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-        )
-      ).toBeDefined()
+      expect(await screen.queryByText(/${strings.isClosed}/i)).toBeDefined()
     })
 
     it('Whitelisted member', async () => {
       useMyMemberships.setActive(alice)
       renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['111', '13', '0'] })
-      expect(
-        screen.queryByText(
-          'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-        )
-      ).toBeNull()
-      expect(screen.queryByText('Please select your council membership to post in this thread.')).toBeNull()
+      expect(await screen.queryByText(/${strings.isClosed}/i)).toBeNull()
+      expect(await screen.queryByText(strings.selectCouncilor)).toBeNull()
       expect(await getButton('Create post')).toBeDefined()
     })
 
     it('Whitelisted member not selected', async () => {
       renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['111', '13', '0'] })
-      expect(await screen.findByText('Please select a whitelisted membership to post in this thread.')).toBeDefined()
+      expect(await screen.queryByText(/${strings.isClosed}/i)).toBeNull()
+      expect(await screen.queryByText(/${strings.selectWhitelisted}/i)).toBeDefined()
     })
 
     it('Council member', async () => {
       useMyMemberships.setActive(councillor)
       renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['111'] })
-      expect(
-        screen.queryByText(
-          'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-        )
-      ).toBeNull()
-      expect(screen.queryByText('Please select your council membership to post in this thread.')).toBeNull()
+      expect(screen.queryByText(/${strings.isClosed}/i)).toBeNull()
+      expect(screen.queryByText(strings.selectCouncilor)).toBeNull()
       expect(await getButton('Create post')).toBeDefined()
     })
 
     it('Council member not selected', async () => {
       useMyMemberships.members = [councillor]
       renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['111'] })
-      expect(await screen.findByText('Please select your council membership to post in this thread.')).toBeDefined()
+      expect(await screen.findByText(strings.selectCouncilor)).toBeDefined()
     })
 
     describe('User has both a council and a whitelisted membership', () => {
@@ -99,12 +96,8 @@ describe('UI: Proposal discussion', () => {
         useMyMemberships.members = [alice, councillor]
         useMyMemberships.setActive(councillor)
         renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['0'] })
-        expect(
-          screen.queryByText(
-            'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-          )
-        ).toBeNull()
-        expect(screen.queryByText('Please select your council membership to post in this thread.')).toBeNull()
+        expect(screen.queryByText(/${strings.isClosed}/i)).toBeNull()
+        expect(screen.queryByText(strings.selectCouncilor)).toBeNull()
         expect(await getButton('Create post')).toBeDefined()
       })
 
@@ -112,24 +105,16 @@ describe('UI: Proposal discussion', () => {
         useMyMemberships.members = [alice, councillor]
         useMyMemberships.setActive(alice)
         renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['0'] })
-        expect(
-          screen.queryByText(
-            'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-          )
-        ).toBeNull()
-        expect(screen.queryByText('Please select your council membership to post in this thread.')).toBeNull()
+        expect(screen.queryByText(strings.isClosed)).toBeNull()
+        expect(screen.queryByText(strings.selectCouncilor)).toBeNull()
         expect(await getButton('Create post')).toBeDefined()
       })
 
       it('Neither member selected', async () => {
         useMyMemberships.members = [alice, councillor]
         renderComponent({ ...baseThread, mode: 'closed', whitelistIds: ['0'] })
-        expect(
-          screen.queryByText(
-            'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-          )
-        ).toBeNull()
-        expect(await screen.findByText('Please select your council membership to post in this thread.')).toBeDefined()
+        expect(screen.queryByText(/${strings.isClosed}/i)).toBeNull()
+        expect(await screen.findByText(strings.selectCouncilor)).toBeDefined()
         expect(screen.queryByText('Create post')).toBeNull()
       })
     })
@@ -139,11 +124,7 @@ describe('UI: Proposal discussion', () => {
     it('Member selected', async () => {
       useMyMemberships.setActive(alice)
       renderComponent({ ...baseThread })
-      expect(
-        screen.queryByText(
-          'The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.'
-        )
-      ).toBeNull()
+      expect(screen.queryByText(/${strings.isClosed}/i)).toBeNull()
       expect(await getButton('Create post')).toBeDefined()
     })