diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb
index 7bc662b46..655d30d14 100644
--- a/app/models/user_name_change_request.rb
+++ b/app/models/user_name_change_request.rb
@@ -12,7 +12,7 @@ class UserNameChangeRequest < ApplicationRecord
     if viewer.is_admin?
       all
     elsif viewer.is_member?
-      joins(:user).merge(User.undeleted).where("user_name_change_requests.user_id = ?", viewer.id)
+      where(user: User.undeleted)
     else
       none
     end
diff --git a/test/functional/user_name_change_requests_controller_test.rb b/test/functional/user_name_change_requests_controller_test.rb
index 6a6ebc0e2..553217b05 100644
--- a/test/functional/user_name_change_requests_controller_test.rb
+++ b/test/functional/user_name_change_requests_controller_test.rb
@@ -45,8 +45,11 @@ class UserNameChangeRequestsControllerTest < ActionDispatch::IntegrationTest
     context "for actions restricted to admins" do
       context "index action" do
         should "render" do
-          get_auth user_name_change_requests_path, @admin
+          post_auth user_name_change_requests_path, @user, params: { user_name_change_request: { desired_name: "zun", desired_name_confirmation: "zun" }}
+          get user_name_change_requests_path
+
           assert_response :success
+          assert_select "table tbody tr", 1
         end
       end
     end