diff --git a/crates/db/src/models/onboarding_state.rs b/crates/db/src/models/onboarding_state.rs
index e2a4e57..5b5cbb3 100644
--- a/crates/db/src/models/onboarding_state.rs
+++ b/crates/db/src/models/onboarding_state.rs
@@ -120,7 +120,7 @@ impl OnboardingStateRepository {
         user_id: Uuid,
         role_id: Uuid,
     ) -> Result<bool, sqlx::Error> {
-        let row = sqlx::query!(
+        let status = sqlx::query_scalar!(
             r#"
             SELECT status FROM onboarding_states
             WHERE user_id = $1 AND role_id = $2
@@ -130,6 +130,6 @@ impl OnboardingStateRepository {
         )
         .fetch_optional(pool)
         .await?;
-        Ok(row.map(|r| r.status == "COMPLETED").unwrap_or(false))
+        Ok(status.map(|s| s == "COMPLETED").unwrap_or(false))
     }
 }
diff --git a/crates/db/src/models/user.rs b/crates/db/src/models/user.rs
index ddb7c94..1ac3c07 100644
--- a/crates/db/src/models/user.rs
+++ b/crates/db/src/models/user.rs
@@ -110,7 +110,7 @@ impl UserRepository {
 
     /// Returns all approved role keys for a user (e.g. ["COMPANY", "JOB_SEEKER"])
     pub async fn get_user_role_keys(pool: &PgPool, user_id: Uuid) -> Result<Vec<String>, sqlx::Error> {
-        let rows = sqlx::query!(
+        let rows = sqlx::query_scalar!(
             r#"
             SELECT r.key
             FROM user_roles ur
@@ -123,7 +123,7 @@ impl UserRepository {
         .fetch_all(pool)
         .await?;
 
-        Ok(rows.into_iter().map(|r| r.key).collect())
+        Ok(rows)
     }
 
     pub async fn set_email_verification_token(