Merge branch 'fix-password-settings-regressions' into 'master'

Shows password form when signed in with linked account

Closes #14379

Doing this to get the builds passing for !3325

See merge request !3381

app/views/profiles/passwords/edit.html.haml

@@ -32,4 +32,5 @@
         = f.password_field :password_confirmation, required: true, class: 'form-control'
       .prepend-top-default.append-bottom-default
         = f.submit 'Save password', class: "btn btn-create append-right-10"
+        - unless @user.password_automatically_set?
           = link_to "I forgot my password", reset_profile_password_path, method: :put, class: "account-btn-link"