diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js
index d8ebcdcc11..13233d2a0a 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js
@@ -16,7 +16,7 @@ export default {
   // Camera Attributes
   CameraStream: {
     itemTypes: ['String'],
-    parameters: () => [p.proxyBaseUrl(), p.resolution(), p.basicAuth('username'), p.basicAuth('password')]
+    parameters: () => [p.proxyBaseUrl(), p.resolution(), p.basicAuthUsername(), p.basicAuthPassword()]
   },
 
   // Cover Attributes
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js
index 052c775512..716a4b3978 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js
@@ -29,9 +29,15 @@ export default {
     advanced: !!defaultValue,
     visible: (_, config) => !config.nonControllable
   }),
-  basicAuth: (setting) => ({
-    name: setting,
-    label: `Basic Authentication ${titleCase(setting)}`,
+  basicAuthPassword: () => ({
+    name: 'password',
+    label: 'Basic Authentication Password',
+    type: 'TEXT',
+    context: 'password'
+  }),
+  basicAuthUsername: () => ({
+    name: 'username',
+    label: 'Basic Authentication Username',
     type: 'TEXT'
   }),
   capabilityNames: (defaultValue, placeholder) => ({