diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b04510f0a..0c1ac49b6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -168,7 +168,7 @@ private
   end
 
   def find_resource
-    @user = params[:id] ? User.find_by(id: params[:id]) : current_user
+    @user = User.find_by(id: params[:id]) || User.find_by(id: params[:user_id]) || current_user
   end
 
   def authenticate_scope!
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 3e6969490..71d184ad6 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -2,5 +2,5 @@
 
 # Configure sensitive parameters which will be filtered from the log file.
 Rails.application.config.filter_parameters += %i[
-  passw secret token _key crypt salt certificate otp ssn
+  passw secret token crypt salt certificate otp ssn
 ]
diff --git a/config/routes.rb b/config/routes.rb
index 803d9bd09..a6b0b9654 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -53,8 +53,8 @@ Rails.application.routes.draw do
   end
 
   resources :users do
-    get "edit_dpo", to: "users#dpo"
-    get "edit_key_contact", to: "users#key_contact"
+    get "edit-dpo", to: "users#dpo"
+    get "edit-key-contact", to: "users#key_contact"
 
     member do
       get "deactivate", to: "users#deactivate"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 528661646..8b2a7be68 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -604,8 +604,6 @@ RSpec.describe UsersController, type: :request do
           expect(page).to have_field("user[name]")
           expect(page).to have_field("user[email]")
           expect(page).to have_field("user[role]")
-          expect(page).to have_field("user[is_dpo]")
-          expect(page).to have_field("user[is_key_contact]")
         end
 
         it "does not allow setting the role to `support`" do
@@ -632,8 +630,6 @@ RSpec.describe UsersController, type: :request do
             expect(page).to have_field("user[name]")
             expect(page).to have_field("user[email]")
             expect(page).to have_field("user[role]")
-            expect(page).to have_field("user[is_dpo]")
-            expect(page).to have_field("user[is_key_contact]")
           end
         end
 
@@ -1251,8 +1247,6 @@ RSpec.describe UsersController, type: :request do
           expect(page).to have_field("user[name]")
           expect(page).to have_field("user[email]")
           expect(page).to have_field("user[role]")
-          expect(page).to have_field("user[is_dpo]")
-          expect(page).to have_field("user[is_key_contact]")
         end
 
         it "allows setting the role to `support`" do
@@ -1279,8 +1273,6 @@ RSpec.describe UsersController, type: :request do
             expect(page).to have_field("user[name]")
             expect(page).to have_field("user[email]")
             expect(page).to have_field("user[role]")
-            expect(page).to have_field("user[is_dpo]")
-            expect(page).to have_field("user[is_key_contact]")
           end
         end
 
@@ -1299,8 +1291,6 @@ RSpec.describe UsersController, type: :request do
             expect(page).to have_field("user[name]")
             expect(page).to have_field("user[email]")
             expect(page).to have_field("user[role]")
-            expect(page).to have_field("user[is_dpo]")
-            expect(page).to have_field("user[is_key_contact]")
           end
         end