diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
index 66beb1ca..8da611bd 100644
--- a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
+++ b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
@@ -19,8 +19,6 @@
                      ForId="@FieldId">
         <InputContent>
             <CascadingValue Name="Standalone" Value="false" IsFixed="true">
-                @if (AdornmentStart != null)
-                {
                     <MudInputExtended T="string"
                                       @ref="InputReference"
                                       @attributes="UserAttributes"
@@ -54,7 +52,8 @@
                                       OnClearButtonClick="@OnClearButtonClick"
                                       Pattern="@Pattern"
                                       DisablePaste="@DisablePaste"
-                                      ShrinkLabel="@ShrinkLabel">
+                                      ShrinkLabel="@ShrinkLabel"
+                                      HasAdornmentStart="@(AdornmentStart != null)">
                         <AdornmentStart>
                             @AdornmentStart
                         </AdornmentStart>
@@ -69,55 +68,6 @@
                             }
                         </AdornmentEnd>
                     </MudInputExtended>
-                }
-                else
-                {
-                    <MudInputExtended T="string"
-                                      @ref="InputReference"
-                                      @attributes="UserAttributes"
-                                      InputType="@GetPasswordInputType()"
-                                      Lines="@Lines"
-                                      Label="@Label"
-                                      Style="@Style"
-                                      Variant="@Variant"
-                                      TextUpdateSuppression="@TextUpdateSuppression"
-                                      Value="@Text"
-                                      ValueChanged="(s) => SetTextAsync(s)"
-                                      Placeholder="@Placeholder"
-                                      Disabled=@Disabled
-                                      Underline="@Underline"
-                                      ReadOnly="@ReadOnly"
-                                      MaxLength="@MaxLength"
-                                      Adornment="@Adornment"
-                                      AdornmentAriaLabel="@AdornmentAriaLabel"
-                                      Error="@Error"
-                                      ErrorId="@ErrorId"
-                                      Immediate="@Immediate"
-                                      Margin="@Margin"
-                                      OnBlur="@OnBlurredAsync"
-                                      OnKeyDown="@InvokeKeyDownAsync"
-                                      OnInternalInputChanged="OnChange"
-                                      OnKeyUp="@InvokeKeyUpAsync"
-                                      KeyDownPreventDefault="KeyDownPreventDefault"
-                                      KeyUpPreventDefault="KeyUpPreventDefault"
-                                      HideSpinButtons="true"
-                                      Clearable="@Clearable"
-                                      OnClearButtonClick="@OnClearButtonClick"
-                                      Pattern="@Pattern"
-                                      DisablePaste="@DisablePaste"
-                                      ShrinkLabel="@ShrinkLabel">
-                        <AdornmentEnd>
-                            @if (CustomAdornment != null)
-                            {
-                                @CustomAdornment
-                            }
-                            else
-                            {
-                                <MudIconButton Icon="@GetPasswordIcon()" Color="@AdornmentColor" Size="@IconSize" OnClick="AdornmentClick" tabindex="@(AdornmentTabStop ? 0 : -1)"></MudIconButton>
-                            }
-                        </AdornmentEnd>
-                    </MudInputExtended>
-                }
             </CascadingValue>
         </InputContent>
     </MudInputControl>