diff --git a/atst/routes/portfolios/index.py b/atst/routes/portfolios/index.py
index cf0a87b0..daf768ae 100644
--- a/atst/routes/portfolios/index.py
+++ b/atst/routes/portfolios/index.py
@@ -177,18 +177,16 @@ def portfolio_reports(portfolio_id):
 
 
 @portfolios_bp.route(
-    "/portfolios/<portfolio_id>/members/<member_id>/delete", methods=["POST"]
+    "/portfolios/<portfolio_id>/members/<user_id>/delete", methods=["POST"]
 )
 @user_can(Permissions.EDIT_PORTFOLIO_USERS, message="update portfolio members")
-def remove_member(portfolio_id, member_id):
-    if member_id == str(g.current_user.id):
+def remove_member(portfolio_id, user_id):
+    if str(g.current_user.id) == user_id:
         raise UnauthorizedError(
-            user=g.current_user, action="you cant remove yourself from the portfolio"
+            g.current_user, "you cant remove yourself from the portfolio"
         )
 
-    portfolio = Portfolios.get(g.current_user, portfolio_id)
-    portfolio_role = PortfolioRoles.get(portfolio_id=portfolio_id, user_id=member_id)
-
+    portfolio_role = PortfolioRoles.get(portfolio_id=portfolio_id, user_id=user_id)
     PortfolioRoles.disable(portfolio_role=portfolio_role)
 
     flash("portfolio_member_removed", member_name=portfolio_role.user.full_name)
@@ -196,7 +194,7 @@ def remove_member(portfolio_id, member_id):
     return redirect(
         url_for(
             "portfolios.portfolio_admin",
-            portfolio_id=portfolio.id,
+            portfolio_id=portfolio_id,
             _anchor="portfolio-members",
             fragment="portfolio-members",
         )
diff --git a/templates/fragments/admin/members_edit.html b/templates/fragments/admin/members_edit.html
index 04d2ed21..2c4df95f 100644
--- a/templates/fragments/admin/members_edit.html
+++ b/templates/fragments/admin/members_edit.html
@@ -1,8 +1,8 @@
 {% from "components/confirmation_button.html" import ConfirmationButton %}
 
-{% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, user.id) %}
-
 {% for subform in member_perms_form.members_permissions %}
+  {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, subform.user_id.data) %}
+
   <tr>
     <td class='name'>{{ subform.member.data }}
       {% if subform.member.data == user.full_name %}
diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html
index 5b4ac977..0763aad0 100644
--- a/templates/fragments/admin/portfolio_members.html
+++ b/templates/fragments/admin/portfolio_members.html
@@ -70,7 +70,7 @@
           }}
 
           <div class="action-group">
-            <form method="POST" action="{{ url_for('portfolios.remove_member', portfolio_id=portfolio.id, member_id=member.user_id)  }}">
+            <form method="POST" action="{{ url_for('portfolios.remove_member', portfolio_id=portfolio.id, user_id=member.user_id)  }}">
               {{ member_perms_form.csrf_token }}
               <button class="usa-button usa-button-danger">
                 {{ "portfolios.members.archive_button" | translate }}
diff --git a/tests/routes/portfolios/test_portfolios_index.py b/tests/routes/portfolios/test_portfolios_index.py
index 29672f9c..88e8115f 100644
--- a/tests/routes/portfolios/test_portfolios_index.py
+++ b/tests/routes/portfolios/test_portfolios_index.py
@@ -92,9 +92,7 @@ def test_remove_portfolio_member(client, user_session):
     user_session(portfolio.owner)
 
     response = client.post(
-        url_for(
-            "portfolios.remove_member", portfolio_id=portfolio.id, member_id=user.id
-        ),
+        url_for("portfolios.remove_member", portfolio_id=portfolio.id, user_id=user.id),
         follow_redirects=False,
     )
 
@@ -121,7 +119,7 @@ def test_remove_portfolio_member_self(client, user_session):
         url_for(
             "portfolios.remove_member",
             portfolio_id=portfolio.id,
-            member_id=portfolio.owner.id,
+            user_id=portfolio.owner.id,
         ),
         follow_redirects=False,
     )