diff --git a/HISTORY.md b/HISTORY.md
index 48d2646bb8fd..73846e624501 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,7 @@
 ## NEXT
 
+- Fixes #2477: Admin settings, plain-text SMTP password.
+
 ## 0.22.0, 2016-Mar-14
 
 - Add AES encryption routines
diff --git a/packages/rocketchat-lib/server/startup/settings.coffee b/packages/rocketchat-lib/server/startup/settings.coffee
index c5b0d37cf055..77889a2e2894 100644
--- a/packages/rocketchat-lib/server/startup/settings.coffee
+++ b/packages/rocketchat-lib/server/startup/settings.coffee
@@ -94,7 +94,7 @@ RocketChat.settings.addGroup 'SMTP', ->
 	@add 'SMTP_Host', '', { type: 'string', env: true }
 	@add 'SMTP_Port', '', { type: 'string', env: true }
 	@add 'SMTP_Username', '', { type: 'string', env: true }
-	@add 'SMTP_Password', '', { type: 'string', env: true }
+	@add 'SMTP_Password', '', { type: 'password', env: true }
 	@add 'From_Email', '', { type: 'string', placeholder: 'email@domain' }
 	@add 'SMTP_Test_Button', 'sendSMTPTestEmail', { type: 'action', actionText: 'Send_a_test_mail_to_my_user' }