diff --git a/atst/routes/ccpo.py b/atst/routes/ccpo.py
index 384a6b50..553e2a00 100644
--- a/atst/routes/ccpo.py
+++ b/atst/routes/ccpo.py
@@ -26,9 +26,7 @@ def activity_history():
 @user_can(Permissions.VIEW_CCPO_USER, message="view ccpo users")
 def users():
     users = Users.get_ccpo_users()
-    data = {}
-    for user in users:
-        data[user] = CCPOUserForm(obj=user)
+    data = [(user, CCPOUserForm(obj=user)) for user in users]
     return render_template("ccpo/users.html", data=data)
 
 
diff --git a/templates/ccpo/users.html b/templates/ccpo/users.html
index 584f2bf8..7e0d2ff8 100644
--- a/templates/ccpo/users.html
+++ b/templates/ccpo/users.html
@@ -25,7 +25,9 @@
         </tr>
       </thead>
       <tbody>
-        {% for user, form in data.items() %}
+        {% for user_data in data %}
+          {% set user = user_data[0] %}
+          {% set form = user_data[1] %}
           {% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %}
           {% set disable_button_class = 'button-danger-outline' %}
           {% if user == g.current_user %}
@@ -56,7 +58,9 @@
   {% endif %}
 
   {% if user_can(permissions.DELETE_CCPO_USER) %}
-    {% for user, form in data.items() %}
+    {% for user_data in data %}
+      {% set user = user_data[0] %}
+      {% set form = user_data[1] %}
       {% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %}
       {% call Modal(name=modal_id) %}
         {{