diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7368e1824..40633787b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [1.17.1](https://github.com/codeRIT/hackathon-manager/compare/v1.17.0...v1.17.1) (2019-07-15)
+
+
+### Bug Fixes
+
+* Correct user_name usage for SMTP mail ([b8e2d2e](https://github.com/codeRIT/hackathon-manager/commit/b8e2d2e))
+* Set SMTP username & password as secret ([2b30306](https://github.com/codeRIT/hackathon-manager/commit/2b30306))
+
 # [1.17.0](https://github.com/codeRIT/hackathon-manager/compare/v1.16.0...v1.17.0) (2019-07-14)
 
 
diff --git a/app/views/manage/configs/index.html.haml b/app/views/manage/configs/index.html.haml
index ad3d4cfcc..10a77bfac 100644
--- a/app/views/manage/configs/index.html.haml
+++ b/app/views/manage/configs/index.html.haml
@@ -79,8 +79,8 @@
               %i To switch to SparkPost, unset the <code>SMTP_ADDRESS</code> environment variable
           = render 'config_row', name: 'SMTP Address', key: 'SMTP_ADDRESS'
           = render 'config_row', name: 'SMTP Port', key: 'SMTP_PORT', default: 587
-          = render 'config_row', name: 'SMTP Username', key: 'SMTP_USER_NAME'
-          = render 'config_row', name: 'SMTP Password', key: 'SMTP_PASSWORD'
+          = render 'config_row', name: 'SMTP Username', key: 'SMTP_USER_NAME', secret: true
+          = render 'config_row', name: 'SMTP Password', key: 'SMTP_PASSWORD', secret: true
         - else
           %p
             %span.badge.badge-success SparkPost
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1111908ad..31cad31b3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -100,7 +100,7 @@
     config.action_mailer.smtp_settings = {
       address: ENV["SMTP_ADDRESS"].presence,
       port: ENV["SMTP_PORT"].presence&.to_i || 587,
-      username: ENV["SMTP_USER_NAME"].presence,
+      user_name: ENV["SMTP_USER_NAME"].presence,
       password: ENV["SMTP_PASSWORD"].presence,
       authentication: ENV["SMTP_AUTHENTICATION"].presence || "plain",
       enable_starttls_auto: ENV["SMTP_STARTTLS_AUTO"] != "false", # defaults to true