diff --git a/CHANGELOG b/CHANGELOG
index d0bc80daafe57dc6c2563024931d91d0332ed9ce..f01da3fe7dd472b22c094ffdc7691640fc838f2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ v 8.1.0 (unreleased)
   - Remove footer text in emails (Zeger-Jan van de Weg)
   - Ensure code blocks are properly highlighted after a note is updated
   - Fix wrong access level badge on MR comments
+  - Hide password in the service settings form
 
 v 8.0.3
   - Fix URL shown in Slack notifications
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 3a22ed832ac4fb19bdc5b0913b95f87c3eaf6944..3047ee8a1ff02db6b068541daa467334b074e436 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -58,6 +58,8 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def service_params
-    params.require(:service).permit(ALLOWED_PARAMS)
+    service_params = params.require(:service).permit(ALLOWED_PARAMS)
+    service_params.delete("password") if service_params["password"].blank?
+    service_params
   end
 end
diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml
index 45ec49280d2db96474fe2ffc3d52e05a32783743..8d6e16f74c3aa0357568c50925c4c89c6e9f410c 100644
--- a/app/views/shared/_field.html.haml
+++ b/app/views/shared/_field.html.haml
@@ -8,7 +8,10 @@
 - help = field[:help]
 
 .form-group
-  = form.label name, title, class: "control-label"
+  - if type == "password" && value.present?
+    = form.label name, "Change #{title}", class: "control-label"
+  - else
+    = form.label name, title, class: "control-label"
   .col-sm-10
     - if type == 'text'
       = form.text_field name, class: "form-control", placeholder: placeholder
@@ -19,6 +22,6 @@
     - elsif type == 'select'
       = form.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
     - elsif type == 'password'
-      = form.password_field name, value: value, class: 'form-control'
+      = form.password_field name, autocomplete: "new-password", class: 'form-control'
     - if help
       %span.help-block= help
diff --git a/features/project/service.feature b/features/project/service.feature
index fdff640ec857e1ea267fbf77af7d3312a266c2d7..5014b52b9f67a65fbcedfdbd401dd8107741a1d2 100644
--- a/features/project/service.feature
+++ b/features/project/service.feature
@@ -72,6 +72,7 @@ Feature: Project Services
     And I click Atlassian Bamboo CI service link
     And I fill Atlassian Bamboo CI settings
     Then I should see Atlassian Bamboo CI service settings saved
+    And I should see empty field Change Password
 
   Scenario: Activate jetBrains TeamCity CI service
     When I visit project "Shop" services page
diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb
index d3b462bfd31116eebff6aa694c2aaf7a0f1eb94d..1c700df0c631cc64bdbc7fc99764558f57d438cf 100644
--- a/features/steps/project/services.rb
+++ b/features/steps/project/services.rb
@@ -202,6 +202,10 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
     expect(find_field('Username').value).to eq 'user'
   end
 
+  step 'I should see empty field Change Password' do
+    expect(find_field('Change Password').value).to be_nil
+  end
+
   step 'I click JetBrains TeamCity CI service link' do
     click_link 'JetBrains TeamCity CI'
   end