diff --git a/src/callers/login.rs b/src/callers/login.rs
index 76a4272..6558af6 100644
--- a/src/callers/login.rs
+++ b/src/callers/login.rs
@@ -45,46 +45,46 @@ pub mod endpoint {
         // Check if user exists
         match repo::user::get(&pool, &payload.username).await {
             Ok(user) => {
-                let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
-                let salt_str = hashing::get_salt(&salt.salt).unwrap();
+                // let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
+                // let salt_str = hashing::get_salt(&salt.salt).unwrap();
                 let unhashed_password = payload.password;
 
+                if hashing::verify_password(&unhashed_password, user.password.clone()).unwrap() {
+                    // Create token
+                    let key = token_stuff::get_key().unwrap();
+                    let (token_literal, duration) = token_stuff::create_token(&key).unwrap();
+
+                    if token_stuff::verify_token(&key, &token_literal) {
+                        (
+                            StatusCode::OK,
+                            Json(response::Response {
+                                message: String::from("Successful"),
+                                data: vec![icarus_models::login_result::LoginResult {
+                                    id: user.id,
+                                    username: user.username,
+                                    token: token_literal,
+                                    token_type: String::from(token_stuff::TOKENTYPE),
+                                    expiration: duration,
+                                }],
+                            }),
+                        )
+                    } else {
+                        return not_found("Could not verify password").await;
+                    }
+                } else {
+                    return not_found("Error Hashing").await;
+                }
+
                 // Check if password is correct
+                /*
                 match hashing::hash_password(&unhashed_password, &salt_str) {
                     Ok(hash_password) => {
-                        if hashing::verify_password(&unhashed_password, hash_password.clone())
-                            .unwrap()
-                        {
-                            // Create token
-                            let key = token_stuff::get_key().unwrap();
-                            let (token_literal, duration) =
-                                token_stuff::create_token(&key).unwrap();
-
-                            if token_stuff::verify_token(&key, &token_literal) {
-                                (
-                                    StatusCode::OK,
-                                    Json(response::Response {
-                                        message: String::from("Successful"),
-                                        data: vec![icarus_models::login_result::LoginResult {
-                                            id: user.id,
-                                            username: user.username,
-                                            token: token_literal,
-                                            token_type: String::from(token_stuff::TOKENTYPE),
-                                            expiration: duration,
-                                        }],
-                                    }),
-                                )
-                            } else {
-                                return not_found("Could not verify password").await;
-                            }
-                        } else {
-                            return not_found("Error Hashing").await;
-                        }
                     }
                     Err(err) => {
                         return not_found(&err.to_string()).await;
                     }
                 }
+                */
             }
             Err(err) => {
                 return not_found(&err.to_string()).await;