diff --git a/controller/src/user/api.rs b/controller/src/user/api.rs
index 861db83..c9b82e1 100644
--- a/controller/src/user/api.rs
+++ b/controller/src/user/api.rs
@@ -79,18 +79,18 @@ async fn list_users(
     query: Query<PaginationParams<EmptyScanParams, UserPage>>,
 ) -> Result<HttpResponseOk<ResultsPage<User>>, HttpError> {
     let pag_params = query.into_inner();
-    let limit = rqctx.page_limit(&pag_params)?.get() as usize;
+    let limit = rqctx.page_limit(&pag_params)?.get() as i64;
     let pg = rqctx.context().pg_pool.to_owned();
 
-    let q = match &pag_params.page {
-        WhichPage::First(..) => None,
-        WhichPage::Next(UserPage { user_id: last_seen }) => Some(last_seen),
+    let last_seen = match &pag_params.page {
+        WhichPage::Next(UserPage { user_id: id }) => Some(id),
+        _ => None,
     };
 
     let users = sqlx::query!(
         r#"SELECT * FROM users WHERE id > coalesce($1, '00000000-0000-0000-0000-000000000000'::UUID) ORDER BY id LIMIT $2"#,
-        q,
-        limit as i64
+        last_seen,
+        limit
     )
     .fetch_all(&pg)
     .await