diff --git a/Netdisco/Changes b/Netdisco/Changes
index bf4a0f9a..a91953b4 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.023001 -
+
+  [BUG FIXES]
+
+  * [80] Password fields in User Management panel should be masked
+
 2.023000 - 2014-02-10
 
   [NEW FEATURES]
diff --git a/Netdisco/share/views/ajax/admintask/users.tt b/Netdisco/share/views/ajax/admintask/users.tt
index a20588c1..2f8b0b66 100644
--- a/Netdisco/share/views/ajax/admintask/users.tt
+++ b/Netdisco/share/views/ajax/admintask/users.tt
@@ -14,7 +14,7 @@
     <tr>
       <td class="nd_center-cell"><input data-form="add" name="fullname" type="text"></td>
       <td class="nd_center-cell"><input data-form="add" name="username" type="text"></td>
-      <td class="nd_center-cell"><input data-form="add" name="password" type="text"></td>
+      <td class="nd_center-cell"><input data-form="add" name="password" type="password"></td>
       <td class="nd_center-cell"><input data-form="add" type="checkbox" name="ldap"></td>
       <td class="nd_center-cell"><input data-form="add" type="checkbox" name="port_control"></td>
       <td class="nd_center-cell"><input data-form="add" type="checkbox" name="admin"></td>
@@ -34,7 +34,7 @@
         <input data-form="update" name="username" type="text" value="[% row.username | html_entity %]">
       </td>
       <td class="nd_center-cell">
-        <input data-form="update" name="password" type="text" value="********">
+        <input data-form="update" name="password" type="password" value="********">
       </td>
       <td class="nd_center-cell">
         <input data-form="update" name="ldap" type="checkbox" [% 'checked="checked"' IF row.ldap %]>