diff --git a/blazorbootstrap/Components/Form/PasswordInput/PasswordInput.razor b/blazorbootstrap/Components/Form/PasswordInput/PasswordInput.razor
new file mode 100644
index 000000000..4123d7373
--- /dev/null
+++ b/blazorbootstrap/Components/Form/PasswordInput/PasswordInput.razor
@@ -0,0 +1,16 @@
+@namespace BlazorBootstrap
+@inherits BlazorBootstrapComponentBase
+@preservewhitespace true
+
+<div class="input-group mb-3">
+    <input 
+        @ref="@Element" 
+        type="@InputTextType"
+        id="@Id"
+        class="@BootstrapClass.FormControl"
+        disabled="@Disabled"
+        value="@Value"
+        @attributes="@AdditionalAttributes"
+        @onchange="OnChange">
+        <button type="button" class="btn btn-primary btn-sm" @onclick="OnShowHidePasswordButtonClick"><i class="bi bi-eye-fill" /></button>
+</div>
diff --git a/blazorbootstrap/Components/Form/PasswordInput/PasswordInput.razor.cs b/blazorbootstrap/Components/Form/PasswordInput/PasswordInput.razor.cs
new file mode 100644
index 000000000..e69698788
--- /dev/null
+++ b/blazorbootstrap/Components/Form/PasswordInput/PasswordInput.razor.cs
@@ -0,0 +1,118 @@
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components;
+using System.Linq.Expressions;
+
+namespace BlazorBootstrap
+{
+    public partial class PasswordInput
+    {
+        #region Fields and Constants
+
+        private FieldIdentifier fieldIdentifier;
+
+        private string? oldValue;
+
+        #endregion
+
+        #region Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            oldValue = Value;
+
+            AdditionalAttributes ??= new Dictionary<string, object>();
+
+            fieldIdentifier = FieldIdentifier.Create(ValueExpression);
+
+            await base.OnInitializedAsync();
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
+            if (oldValue != Value)
+            {
+                await ValueChanged.InvokeAsync(Value);
+
+                EditContext?.NotifyFieldChanged(fieldIdentifier);
+
+                oldValue = Value;
+            }
+        }
+
+        public string InputTextType = "password";
+
+        void OnShowHidePasswordButtonClick()
+        {
+            if (this.InputTextType == "password")
+                this.InputTextType = "text";
+            else
+                this.InputTextType = "password";
+        }
+
+        /// <summary>
+        /// Disables InputPassword.
+        /// </summary>
+        public void Disable() => Disabled = true;
+
+        /// <summary>
+        /// Enables InputPassword.
+        /// </summary>
+        public void Enable() => Disabled = false;
+
+        /// <summary>
+        /// This event is triggered only when the user changes the selection from the UI.
+        /// </summary>
+        /// <param name="args"></param>
+        private async Task OnChange(ChangeEventArgs args)
+        {
+            Value = args.Value?.ToString();
+
+            await ValueChanged.InvokeAsync(Value);
+
+            EditContext?.NotifyFieldChanged(fieldIdentifier);
+
+            oldValue = Value;
+        }
+
+        #endregion
+
+        #region Properties, Indexers
+
+        protected override string? ClassNames =>
+            BuildClassNames(Class,
+                (BootstrapClass.FormControl, true));
+
+        /// <summary>
+        /// Gets or sets the disabled state.
+        /// </summary>
+        /// <remarks>
+        /// Default value is false.
+        /// </remarks>
+        [Parameter]
+        public bool Disabled { get; set; }
+
+        [CascadingParameter] private EditContext EditContext { get; set; } = default!;
+
+        private string fieldCssClasses => EditContext?.FieldCssClass(fieldIdentifier) ?? "";
+
+
+        /// <summary>
+        /// Gets or sets the value.
+        /// </summary>
+        /// <remarks>
+        /// Default value is null.
+        /// </remarks>
+        [Parameter]
+        public string? Value { get; set; } = default!;
+
+        /// <summary>
+        /// This event is fired when the inputpassword value changes.
+        /// </summary>
+        [Parameter]
+        public EventCallback<string?> ValueChanged { get; set; } = default!;
+
+        [Parameter] public Expression<Func<string?>> ValueExpression { get; set; } = default!;
+
+        #endregion
+    }
+}