diff --git a/tests/v2/users.py b/tests/v2/users.py
index 659e839..97754a1 100644
--- a/tests/v2/users.py
+++ b/tests/v2/users.py
@@ -140,6 +140,18 @@ def test_cml_users_update_user_fail(self):
             result = runner.invoke(virl, ["users", "update", "nonexistent_user"])
             self.assertEqual(1, result.exit_code)
 
+    def test_cml_users_update_all_users(self):
+        with self.get_context() as m:
+            self.setup_mocks(m)
+            self.setup_func("get", m, "users", json=self.get_users)
+            self.setup_func("get", m, "groups", json=self.get_groups)
+            self.setup_func("patch", m, "users/00000000-0000-4000-a000-000000000000", json=self.patch_users)
+            self.setup_func("patch", m, "users/9e4e75b4-aaab-47af-9edb-9364460a81ae", json=self.patch_users)
+            virl = self.get_virl()
+            runner = CliRunner()
+            result = runner.invoke(virl, ["users", "update", "placeholder", "--all-users"])
+            self.assertEqual(0, result.exit_code)
+
     def test_cml_users_delete_user(self):
         with self.get_context() as m:
             self.setup_mocks(m)
diff --git a/virl/cli/users/update/commands.py b/virl/cli/users/update/commands.py
index bb1fff7..ba0b250 100644
--- a/virl/cli/users/update/commands.py
+++ b/virl/cli/users/update/commands.py
@@ -32,7 +32,7 @@ def update_users(usernames, admin, group, remove_from_all_groups, change_passwor
 
     users = client.user_management.users()
     user_mapping = {user["username"]: user["id"] for user in users}
-    all_usernames = users if all_users else usernames
+    all_usernames = [user["username"] for user in users] if all_users else usernames
 
     for username in all_usernames:
         user_id = user_mapping[username]