diff --git a/NzbDrone.Web/Views/Settings/Growl.cshtml b/NzbDrone.Web/Views/Settings/Growl.cshtml
index c000651e0..59f4aebf7 100644
--- a/NzbDrone.Web/Views/Settings/Growl.cshtml
+++ b/NzbDrone.Web/Views/Settings/Growl.cshtml
@@ -29,5 +29,5 @@
     <label class="labelClass">@Html.LabelFor(m => m.GrowlPassword)
     <span class="small">@Html.DescriptionFor(m => m.GrowlPassword)</span>
     </label>
-    @Html.TextBoxFor(m => m.GrowlPassword, new { @class = "inputClass" })
+    @Html.PasswordFor(m => m.GrowlPassword, new { @class = "inputClass" })
 </div>
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index d4ffe53b0..02a79de04 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -80,7 +80,7 @@
                 <label class="labelClass">@Html.LabelFor(m => m.NewzbinPassword)
                     <span class="small">@Html.DescriptionFor(m => m.NewzbinPassword)</span>
                 </label>
-                @Html.TextBoxFor(m => m.NewzbinPassword, new { @class = "inputClass" })
+                @Html.PasswordFor(m => m.NewzbinPassword, new { @class = "inputClass" })
             </div>
             <h3>
                 <a href="#">Newznab</a></h3>
diff --git a/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml b/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
index cdee764c0..977f780a2 100644
--- a/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
+++ b/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
@@ -37,7 +37,7 @@
         <label class="labelClass">@Html.LabelFor(m => m.SabPassword)
             <span class="small">@Html.DescriptionFor(m => m.SabPassword)</span>
         </label>
-        @Html.TextBoxFor(m => m.SabPassword, new { @class = "inputClass" })
+        @Html.PasswordFor(m => m.SabPassword, new { @class = "inputClass" })
 
         <label class="labelClass">@Html.LabelFor(m => m.SabTvCategory)
             <span class="small">@Html.DescriptionFor(m => m.SabTvCategory)</span>
diff --git a/NzbDrone.Web/Views/Settings/Smtp.cshtml b/NzbDrone.Web/Views/Settings/Smtp.cshtml
index 533643d2b..4b0fb63ed 100644
--- a/NzbDrone.Web/Views/Settings/Smtp.cshtml
+++ b/NzbDrone.Web/Views/Settings/Smtp.cshtml
@@ -44,7 +44,7 @@
     <label class="labelClass">@Html.LabelFor(m => m.SmtpPassword)
     <span class="small">@Html.DescriptionFor(m => m.SmtpPassword)</span>
     </label>
-    @Html.TextBoxFor(m => m.SmtpPassword, new { @class = "inputClass" })
+    @Html.PasswordFor(m => m.SmtpPassword, new { @class = "inputClass" })
 
     <label class="labelClass">@Html.LabelFor(m => m.SmtpFromAddress)
     <span class="small">@Html.DescriptionFor(m => m.SmtpFromAddress)</span>
diff --git a/NzbDrone.Web/Views/Settings/Xbmc.cshtml b/NzbDrone.Web/Views/Settings/Xbmc.cshtml
index 57d556193..05c7e40ab 100644
--- a/NzbDrone.Web/Views/Settings/Xbmc.cshtml
+++ b/NzbDrone.Web/Views/Settings/Xbmc.cshtml
@@ -44,5 +44,5 @@
     <label class="labelClass">@Html.LabelFor(m => m.XbmcPassword)
     <span class="small">@Html.DescriptionFor(m => m.XbmcPassword)</span>
     </label>
-    @Html.TextBoxFor(m => m.XbmcPassword, new { @class = "inputClass" })
+    @Html.PasswordFor(m => m.XbmcPassword, new { @class = "inputClass" })
 </div>
\ No newline at end of file