diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c070f71..38a35a1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,17 @@ Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
 ### No issue
+  Using password type for keystore password field
+  
+  [2ed60daaa8fe1a2](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/2ed60daaa8fe1a2) Tomas Bjerre *2016-05-10 15:57:28*
+
   doc
   
-  [55f19dc010bf728](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/55f19dc010bf728) Tomas Bjerre *2016-05-09 16:10:09*
+  [934453f12768a51](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/934453f12768a51) Tomas Bjerre *2016-05-10 15:51:17*
+
+  Change proxy url/port fields to text
+  
+  [27750702101f275](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/27750702101f275) Stefan Anzinger *2016-05-10 15:22:41*
 
 ## 2.18
 ### GitHub [#109](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/109) Refactor admin pages
diff --git a/src/main/resources/admin.vm b/src/main/resources/admin.vm
index 28c17ae6..5f6e28c0 100644
--- a/src/main/resources/admin.vm
+++ b/src/main/resources/admin.vm
@@ -126,7 +126,7 @@
     </div>
     <div class="field-group">
      <label>Keystore password </label>
-     <input class="text long-field" type="text" name="keyStorePassword">
+     <input class="text long-field" type="password" name="keyStorePassword">
      <div class="description">Optional password to use for custom keystore.</div>
     </div>
     <div class="field-group">