diff --git a/Dockerfile b/Dockerfile
index 51396aa..fdeb70e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM rust:latest as build
 
+ENV DATABASE_URL="postgres://school_app_api_user:school_app_api_pass@mdev.local/school_app_api"
 WORKDIR /usr/src/school_app_api
 COPY . .
 
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index bd12f7d..e45ff18 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -28,7 +28,6 @@ jobs:
 - name: test
   plan:
   - get: repo
-  - get: rust
     trigger: true
   - task: test
     config: 
@@ -38,6 +37,7 @@ jobs:
         source: 
           repository: rust
       params:
+        DATABASE_URL: "postgres://school_app_api_user:school_app_api_pass@mdev.local/school_app_api"
         CARGO_HOME: "./.cargo-config/"
         RUSTUP_HOME: "./.rustup-config"
 
@@ -65,6 +65,7 @@ jobs:
         source: 
           repository: rust
       params:
+        DATABASE_URL: "postgres://school_app_api_user:school_app_api_pass@mdev.local/school_app_api"
         CARGO_HOME: "./.cargo-config/"
         RUSTUP_HOME: "./.rustup-config"
 
@@ -93,6 +94,7 @@ jobs:
         source: 
           repository: rust
       params:
+        DATABASE_URL: "postgres://school_app_api_user:school_app_api_pass@mdev.local/school_app_api"
         CARGO_HOME: "./.cargo-config/"
         RUSTUP_HOME: "./.rustup-config"
 
@@ -122,6 +124,7 @@ jobs:
           source: 
             repository: rust
         params:
+          DATABASE_URL: "postgres://school_app_api_user:school_app_api_pass@mdev.local/school_app_api"
           CARGO_HOME: "./.cargo-config/"
           RUSTUP_HOME: "./.rustup-config"
 
@@ -156,6 +159,7 @@ jobs:
         source: 
           repository: rust
       params:
+        DATABASE_URL: "postgres://school_app_api_user:school_app_api_pass@mdev.local/school_app_api"
         CARGO_HOME: "./.cargo-config/"
         RUSTUP_HOME: "./.rustup-config"
 
diff --git a/src/main.rs b/src/main.rs
index c1b8c25..e1c4aff 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ use std::net::SocketAddr;
 
 #[derive(Clone, Serialize, Deserialize, Debug, Hash)]
 struct Claims {
+    id: i32,
     username: String,
 }
 
@@ -121,7 +122,7 @@ async fn signin(
 
     let result = sqlx::query!(
         r#"
-            SELECT username
+            SELECT id, username
             FROM users
             WHERE username = $1 AND password = $2
         "#,
@@ -134,6 +135,7 @@ async fn signin(
     match result {
         Ok(Some(user)) => {
             let claims = Claims {
+                id: user.id,
                 username: user.username,
             };
             let token = match jsonwebtoken::encode(&Header::default(), &claims, &app_state.jwt_key)