diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte
index 3d3129ed35..ef3355b3c0 100644
--- a/src/lib/elements/forms/inputText.svelte
+++ b/src/lib/elements/forms/inputText.svelte
@@ -23,6 +23,7 @@
     export let maxlength: number = null;
     export let tooltip: string = null;
     export let isMultiple = false;
+    export let isPopoverDefined = true;
 
     let element: HTMLInputElement;
     let error: string;
@@ -73,10 +74,10 @@
     $: wrapper = isMultiple ? FormItemPart : FormItem;
 </script>
 
-<svelte:component this={wrapper} {fullWidth}>
+<svelte:component this={wrapper} {fullWidth} >
     {#if label}
         <Label {required} {hideRequired} {tooltip} {optionalText} hide={!showLabel} for={id}>
-            {label}{#if $$slots.popover}
+            {label}{#if $$slots.popover && isPopoverDefined}
                 <Drop bind:show display="inline-block">
                     <!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
                     &nbsp;<button
diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts
index af2cc236b2..edbea11907 100644
--- a/src/routes/console/project-[project]/messaging/providers/store.ts
+++ b/src/routes/console/project-[project]/messaging/providers/store.ts
@@ -26,7 +26,7 @@ type ProvidersMap = {
                 configure: {
                     label: string;
                     name: string;
-                    type: 'text' | 'phone' | 'email' | 'domain' | 'file' | 'switch';
+                    type: 'text' | 'password' | 'phone' | 'email' | 'domain' | 'file' | 'switch';
                     placeholder?: string;
                     description?: string;
                     popover?: string[];
@@ -338,7 +338,7 @@ export const providers: ProvidersMap = {
                     {
                         label: 'Password',
                         name: 'password',
-                        type: 'text',
+                        type: 'password',
                         placeholder: 'Enter password'
                     },
                     {
diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte b/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte
index 404b4f69ad..12b7c0567d 100644
--- a/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte
+++ b/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte
@@ -5,7 +5,8 @@
         InputEmail,
         InputFile,
         InputSwitch,
-        InputText
+        InputText,
+        InputPassword
     } from '$lib/elements/forms';
     import InputPhone from '$lib/elements/forms/inputPhone.svelte';
     import { WizardStep } from '$lib/layout';
@@ -52,7 +53,18 @@
     <FormList>
         {#each inputs as input}
             {#if input.type === 'text'}
-                <InputText
+              <InputText
+                  id={input.name}
+                  label={input.label}
+                  placeholder={input.placeholder}
+                  isPopoverDefined={input.popover !== undefined}
+                  bind:value={$providerParams[$provider][input.name]}>
+                  <svelte:fragment slot="popover">
+                      {@html input.popover?.join('<br/><br/>')}
+                  </svelte:fragment>
+              </InputText>
+            {:else if input.type === 'password'}
+                <InputPassword
                     id={input.name}
                     label={input.label}
                     placeholder={input.placeholder}
@@ -60,7 +72,7 @@
                     <svelte:fragment slot="popover">
                         {@html input.popover?.join('<br/><br/>')}
                     </svelte:fragment>
-                </InputText>
+                </InputPassword>
             {:else if input.type === 'email'}
                 <InputEmail
                     id={input.name}