diff --git a/queries/src/lib.rs b/queries/src/lib.rs
index 3c3ccf6..23d1fdb 100644
--- a/queries/src/lib.rs
+++ b/queries/src/lib.rs
@@ -3,13 +3,13 @@ pub(crate) mod schema {}
 
 #[derive(cynic::QueryVariables, Debug)]
 pub struct DeleteUserVariables<'a> {
-    pub id: &'a str,
+    pub username: &'a str,
 }
 
 #[derive(cynic::QueryFragment, Debug)]
 #[cynic(graphql_type = "Mutation", variables = "DeleteUserVariables")]
 pub struct DeleteUser {
-    #[arguments(userId: $id)]
+    #[arguments(userId: $username)]
     pub delete_user: Success,
 }
 
@@ -20,38 +20,38 @@ pub struct Success {
 
 #[derive(cynic::QueryVariables, Debug)]
 pub struct CreateUserVariables<'a> {
-    pub id: &'a str,
+    pub username: &'a str,
 }
 
 #[derive(cynic::QueryFragment, Debug)]
 #[cynic(graphql_type = "Mutation", variables = "CreateUserVariables")]
 pub struct CreateUser {
-    #[arguments(user: { email: $id, id: $id })]
+    #[arguments(user: { email: $username, id: $username })]
     pub create_user: User,
 }
 
 #[derive(cynic::QueryVariables, Debug)]
 pub struct AddUserToGroupVariables<'a> {
     pub group: i32,
-    pub id: &'a str,
+    pub username: &'a str,
 }
 
 #[derive(cynic::QueryFragment, Debug)]
 #[cynic(graphql_type = "Mutation", variables = "AddUserToGroupVariables")]
 pub struct AddUserToGroup {
-    #[arguments(groupId: $group, userId: $id)]
+    #[arguments(groupId: $group, userId: $username)]
     pub add_user_to_group: Success,
 }
 
 #[derive(cynic::QueryVariables, Debug)]
 pub struct GetUserVariables<'a> {
-    pub id: &'a str,
+    pub username: &'a str,
 }
 
 #[derive(cynic::QueryFragment, Debug)]
 #[cynic(graphql_type = "Query", variables = "GetUserVariables")]
 pub struct GetUser {
-    #[arguments(userId: $id)]
+    #[arguments(userId: $username)]
     pub user: User,
 }
 
@@ -74,14 +74,14 @@ mod tests {
 
     #[test]
     fn delete_user_gql_output() {
-        let operation = DeleteUser::build(DeleteUserVariables { id: "user" });
+        let operation = DeleteUser::build(DeleteUserVariables { username: "user" });
 
         insta::assert_snapshot!(operation.query);
     }
 
     #[test]
     fn create_user_gql_output() {
-        let operation = CreateUser::build(CreateUserVariables { id: "user" });
+        let operation = CreateUser::build(CreateUserVariables { username: "user" });
 
         insta::assert_snapshot!(operation.query);
     }
@@ -89,7 +89,7 @@ mod tests {
     #[test]
     fn add_user_to_group_gql_output() {
         let operation = AddUserToGroup::build(AddUserToGroupVariables {
-            id: "user",
+            username: "user",
             group: 3,
         });
 
@@ -98,7 +98,7 @@ mod tests {
 
     #[test]
     fn get_user_gql_output() {
-        let operation = GetUser::build(GetUserVariables { id: "user" });
+        let operation = GetUser::build(GetUserVariables { username: "user" });
 
         insta::assert_snapshot!(operation.query);
     }
diff --git a/queries/src/snapshots/queries__tests__add_user_to_group_gql_output.snap b/queries/src/snapshots/queries__tests__add_user_to_group_gql_output.snap
index 302671d..faabf7c 100644
--- a/queries/src/snapshots/queries__tests__add_user_to_group_gql_output.snap
+++ b/queries/src/snapshots/queries__tests__add_user_to_group_gql_output.snap
@@ -1,9 +1,9 @@
 ---
-source: src/lib.rs
+source: queries/src/lib.rs
 expression: operation.query
 ---
-mutation AddUserToGroup($group: Int!, $id: String!) {
-  addUserToGroup(groupId: $group, userId: $id) {
+mutation AddUserToGroup($group: Int!, $username: String!) {
+  addUserToGroup(groupId: $group, userId: $username) {
     ok
   }
 }
diff --git a/queries/src/snapshots/queries__tests__create_user_gql_output.snap b/queries/src/snapshots/queries__tests__create_user_gql_output.snap
index 8d48eb3..01bc528 100644
--- a/queries/src/snapshots/queries__tests__create_user_gql_output.snap
+++ b/queries/src/snapshots/queries__tests__create_user_gql_output.snap
@@ -2,8 +2,8 @@
 source: queries/src/lib.rs
 expression: operation.query
 ---
-mutation CreateUser($id: String!) {
-  createUser(user: {email: $id, id: $id}) {
+mutation CreateUser($username: String!) {
+  createUser(user: {email: $username, id: $username}) {
     id
     groups {
       id
diff --git a/queries/src/snapshots/queries__tests__delete_user_gql_output.snap b/queries/src/snapshots/queries__tests__delete_user_gql_output.snap
index 26f9030..159ef60 100644
--- a/queries/src/snapshots/queries__tests__delete_user_gql_output.snap
+++ b/queries/src/snapshots/queries__tests__delete_user_gql_output.snap
@@ -1,9 +1,9 @@
 ---
-source: src/lib.rs
+source: queries/src/lib.rs
 expression: operation.query
 ---
-mutation DeleteUser($id: String!) {
-  deleteUser(userId: $id) {
+mutation DeleteUser($username: String!) {
+  deleteUser(userId: $username) {
     ok
   }
 }
diff --git a/queries/src/snapshots/queries__tests__get_user_gql_output.snap b/queries/src/snapshots/queries__tests__get_user_gql_output.snap
index 8344680..7702fd0 100644
--- a/queries/src/snapshots/queries__tests__get_user_gql_output.snap
+++ b/queries/src/snapshots/queries__tests__get_user_gql_output.snap
@@ -2,8 +2,8 @@
 source: queries/src/lib.rs
 expression: operation.query
 ---
-query GetUser($id: String!) {
-  user(userId: $id) {
+query GetUser($username: String!) {
+  user(userId: $username) {
     id
     groups {
       id
diff --git a/src/lldap.rs b/src/lldap.rs
index 81704d4..414dbe2 100644
--- a/src/lldap.rs
+++ b/src/lldap.rs
@@ -101,7 +101,7 @@ pub struct LldapClient {
 
 impl LldapClient {
     pub async fn get_user(&self, username: &str) -> Result<User> {
-        let operation = GetUser::build(GetUserVariables { id: username });
+        let operation = GetUser::build(GetUserVariables { username });
         let response = self
             .client
             .post(format!("{}/api/graphql", self.url))
@@ -112,7 +112,7 @@ impl LldapClient {
     }
 
     pub async fn create_user(&self, username: &str) -> Result<User> {
-        let operation = CreateUser::build(CreateUserVariables { id: username });
+        let operation = CreateUser::build(CreateUserVariables { username });
 
         let response = self
             .client
@@ -124,7 +124,7 @@ impl LldapClient {
     }
 
     pub async fn delete_user(&self, username: &str) -> Result<()> {
-        let operation = DeleteUser::build(DeleteUserVariables { id: username });
+        let operation = DeleteUser::build(DeleteUserVariables { username });
 
         let response = self
             .client