diff --git a/web/src/i18n/en/index.ts b/web/src/i18n/en/index.ts
index c8c7fb13f6..a94620912d 100644
--- a/web/src/i18n/en/index.ts
+++ b/web/src/i18n/en/index.ts
@@ -1232,7 +1232,7 @@ const en: BaseTranslation = {
       helper: '<p>Here you can change enterprise settings.</p>',
       fields: {
         deviceManagement: {
-          label: 'Disable users ability to manage their devices',
+          label: "Disable users' ability to manage their devices",
           helper:
             "When this option is enabled, only users in the Admin group can manage devices in user profile (it's disabled for all other users)",
         },
@@ -1242,9 +1242,9 @@ const en: BaseTranslation = {
             'When this option is enabled, users will not be able to route all traffic through the VPN using the defguard client.',
         },
         manualConfig: {
-          label: 'Disable users ability to download manual WireGuard configuration',
+          label: "Disable users' ability to manually configure WireGuard client",
           helper:
-            "When this option is enabled, users won't be presented with a WireGuard configuration for manual client setup",
+            "When this option is enabled, users won't be able to view or download configuration for the manual WireGuard client setup. Only the Defguard desktop client configuration will be available.",
         },
       },
     },
diff --git a/web/src/i18n/i18n-types.ts b/web/src/i18n/i18n-types.ts
index b5feb55d1a..524f84697c 100644
--- a/web/src/i18n/i18n-types.ts
+++ b/web/src/i18n/i18n-types.ts
@@ -2928,7 +2928,7 @@ type RootTranslation = {
 			fields: {
 				deviceManagement: {
 					/**
-					 * D​i​s​a​b​l​e​ ​u​s​e​r​s​ ​a​b​i​l​i​t​y​ ​t​o​ ​m​a​n​a​g​e​ ​t​h​e​i​r​ ​d​e​v​i​c​e​s
+					 * D​i​s​a​b​l​e​ ​u​s​e​r​s​'​ ​a​b​i​l​i​t​y​ ​t​o​ ​m​a​n​a​g​e​ ​t​h​e​i​r​ ​d​e​v​i​c​e​s
 					 */
 					label: string
 					/**
@@ -2948,11 +2948,11 @@ type RootTranslation = {
 				}
 				manualConfig: {
 					/**
-					 * D​i​s​a​b​l​e​ ​u​s​e​r​s​ ​a​b​i​l​i​t​y​ ​t​o​ ​d​o​w​n​l​o​a​d​ ​m​a​n​u​a​l​ ​W​i​r​e​G​u​a​r​d​ ​c​o​n​f​i​g​u​r​a​t​i​o​n
+					 * D​i​s​a​b​l​e​ ​u​s​e​r​s​'​ ​a​b​i​l​i​t​y​ ​t​o​ ​m​a​n​u​a​l​l​y​ ​c​o​n​f​i​g​u​r​e​ ​W​i​r​e​G​u​a​r​d​ ​c​l​i​e​n​t
 					 */
 					label: string
 					/**
-					 * W​h​e​n​ ​t​h​i​s​ ​o​p​t​i​o​n​ ​i​s​ ​e​n​a​b​l​e​d​,​ ​u​s​e​r​s​ ​w​o​n​'​t​ ​b​e​ ​p​r​e​s​e​n​t​e​d​ ​w​i​t​h​ ​a​ ​W​i​r​e​G​u​a​r​d​ ​c​o​n​f​i​g​u​r​a​t​i​o​n​ ​f​o​r​ ​m​a​n​u​a​l​ ​c​l​i​e​n​t​ ​s​e​t​u​p
+					 * W​h​e​n​ ​t​h​i​s​ ​o​p​t​i​o​n​ ​i​s​ ​e​n​a​b​l​e​d​,​ ​u​s​e​r​s​ ​w​o​n​'​t​ ​b​e​ ​a​b​l​e​ ​t​o​ ​v​i​e​w​ ​o​r​ ​d​o​w​n​l​o​a​d​ ​c​o​n​f​i​g​u​r​a​t​i​o​n​ ​f​o​r​ ​t​h​e​ ​m​a​n​u​a​l​ ​W​i​r​e​G​u​a​r​d​ ​c​l​i​e​n​t​ ​s​e​t​u​p​.​ ​O​n​l​y​ ​t​h​e​ ​D​e​f​g​u​a​r​d​ ​d​e​s​k​t​o​p​ ​c​l​i​e​n​t​ ​c​o​n​f​i​g​u​r​a​t​i​o​n​ ​w​i​l​l​ ​b​e​ ​a​v​a​i​l​a​b​l​e​.
 					 */
 					helper: string
 				}
@@ -7178,7 +7178,7 @@ export type TranslationFunctions = {
 			fields: {
 				deviceManagement: {
 					/**
-					 * Disable users ability to manage their devices
+					 * Disable users' ability to manage their devices
 					 */
 					label: () => LocalizedString
 					/**
@@ -7198,11 +7198,11 @@ export type TranslationFunctions = {
 				}
 				manualConfig: {
 					/**
-					 * Disable users ability to download manual WireGuard configuration
+					 * Disable users' ability to manually configure WireGuard client
 					 */
 					label: () => LocalizedString
 					/**
-					 * When this option is enabled, users won't be presented with a WireGuard configuration for manual client setup
+					 * When this option is enabled, users won't be able to view or download configuration for the manual WireGuard client setup. Only the Defguard desktop client configuration will be available.
 					 */
 					helper: () => LocalizedString
 				}
diff --git a/web/src/i18n/pl/index.ts b/web/src/i18n/pl/index.ts
index c5ed257d94..e9a8c72c3b 100644
--- a/web/src/i18n/pl/index.ts
+++ b/web/src/i18n/pl/index.ts
@@ -1229,9 +1229,9 @@ Uwaga, podane tutaj konfiguracje nie posiadają klucza prywatnego. Musisz uzupe
             'Kiedy ta opcja jest włączona, użytkownicy nie będą mogli przekierować całego ruchu przez VPN za pomocą klienta Defguard.',
         },
         manualConfig: {
-          label: 'Wyłącz wyświetlanie konfiguracji WireGuard',
+          label: 'Wyłącz manualną konfigurację WireGuard',
           helper:
-            'Kiedy ta opcja jest włączona, konfiguracja WireGuard nie będzie wyświetlana użytkownikom podczas konfiguracji urządzenia.',
+            'Kiedy ta opcja jest włączona, użytkownicy nie będą mogli pobrać ani wyświetlić danych do manualnej konfiguracji WireGuard. Możliwe będzie wyłącznie skonfigurowanie klienta Defguard.',
         },
       },
     },
diff --git a/web/src/pages/addDevice/steps/AddDeviceTokenStep/AddDeviceTokenStep.tsx b/web/src/pages/addDevice/steps/AddDeviceTokenStep/AddDeviceTokenStep.tsx
index 1349ecb768..12d3f9305e 100644
--- a/web/src/pages/addDevice/steps/AddDeviceTokenStep/AddDeviceTokenStep.tsx
+++ b/web/src/pages/addDevice/steps/AddDeviceTokenStep/AddDeviceTokenStep.tsx
@@ -85,7 +85,6 @@ export const AddDeviceTokenStep = () => {
       <MessageBox
         type={MessageBoxType.WARNING}
         message={parse(LL.addDevicePage.helpers.client())}
-        dismissId="add-device-page-method-opt-message"
       />
       <Card id="add-device-token-step" shaded>
         <h2>{localLL.title()}</h2>