diff --git a/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js b/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js
index fd1782b251..7b2d92d891 100644
--- a/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js
+++ b/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js
@@ -85,6 +85,7 @@ const GatewayClaimFormSection = () => {
         encode={btoa}
         decode={atob}
         disabled={withQRdata}
+        sensitive
         autoFocus
       />
       <Form.Field
diff --git a/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js b/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js
index ec26c41f1a..4d0270990e 100644
--- a/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js
+++ b/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js
@@ -67,7 +67,7 @@ const GatewayQRScanSection = () => {
       },
       authenticated_identifiers: {
         gateway_eui: gateway.gateway_eui,
-        authentication_code: gateway.owner_token ? gateway.owner_token : '',
+        authentication_code: gateway.owner_token ? btoa(gateway.owner_token) : '',
       },
     }))