diff --git a/lib/pbench/cli/server/user_management.py b/lib/pbench/cli/server/user_management.py
index ed642d043d..22df4b499c 100644
--- a/lib/pbench/cli/server/user_management.py
+++ b/lib/pbench/cli/server/user_management.py
@@ -7,7 +7,7 @@
 from pbench.server.database.models.users import User
 
 USER_LIST_ROW_FORMAT = "{0:15}\t{1:36}"
-USER_LIST_HEADER_ROW = USER_LIST_ROW_FORMAT.format("Username", "oidc id")
+USER_LIST_HEADER_ROW = USER_LIST_ROW_FORMAT.format("Username", "OIDC ID")
 
 
 @click.group("user_group")
diff --git a/lib/pbench/server/api/resources/upload_api.py b/lib/pbench/server/api/resources/upload_api.py
index 91800b23a2..4779e649b2 100644
--- a/lib/pbench/server/api/resources/upload_api.py
+++ b/lib/pbench/server/api/resources/upload_api.py
@@ -224,7 +224,7 @@ def _put(self, args: ApiParams, request: Request, context: ApiContext) -> Respon
             # Create a tracking dataset object; it'll begin in UPLOADING state
             try:
                 dataset = Dataset(
-                    owner_id=user_id,
+                    owner=username,
                     name=Dataset.stem(tar_full_path),
                     resource_id=md5sum,
                     access=access,
diff --git a/lib/pbench/server/database/alembic/versions/f628657bed56_user_table_update_oidc.py b/lib/pbench/server/database/alembic/versions/f628657bed56_user_table_update_oidc.py
index 145c12eb66..33f853aeb7 100644
--- a/lib/pbench/server/database/alembic/versions/f628657bed56_user_table_update_oidc.py
+++ b/lib/pbench/server/database/alembic/versions/f628657bed56_user_table_update_oidc.py
@@ -17,7 +17,6 @@
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
     op.add_column("users", sa.Column("_roles", sa.String(length=255), nullable=True))
     op.execute("ALTER TABLE users DROP CONSTRAINT users_pkey CASCADE")
     op.alter_column(
@@ -47,7 +46,6 @@ def upgrade() -> None:
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
     op.execute("ALTER TABLE users DROP CONSTRAINT user_primary CASCADE")
     op.add_column(
         "users",
diff --git a/lib/pbench/server/database/models/users.py b/lib/pbench/server/database/models/users.py
index 3fa57cd8f4..0356803898 100644
--- a/lib/pbench/server/database/models/users.py
+++ b/lib/pbench/server/database/models/users.py
@@ -48,7 +48,7 @@ def __str__(self) -> str:
 
 
 class UserNullKey(UserError):
-    """Attempt to commit an User row with an empty required column."""
+    """Attempt to commit a User row with an empty required column."""
 
     def __init__(self, user: "User", cause: str):
         self.user = user