diff --git a/assignment-db-service/app.js b/assignment-db-service/app.js
index 053f556..61a7a37 100644
--- a/assignment-db-service/app.js
+++ b/assignment-db-service/app.js
@@ -127,7 +127,7 @@ app.get("/assignments/:qrNumber", async (req, res) => {
   try {
     console.log("Fetching assignment with QR Code Number:", req.params.qrNumber);
 
-    const assignment = await prisma.assignments.findMany({
+    const assignment = await prisma.assignments.findUnique({
       where: { qrcodenumber: parseInt(req.params.qrNumber) },
     });
 
@@ -148,17 +148,19 @@ app.get("/assignments/:qrNumber", async (req, res) => {
 app.get("/assignments/appname/:appName", async (req, res) => {
   try {
     const { appName } = req.params;
-    const assignments = await prisma.assignments.findMany({
+    const assignment = await prisma.assignments.findUnique({
       where: { appname: appName },
     });
 
-    if (assignments.length === 0) {
-      return res.status(404).json({ message: "No assignments found" });
+    if (!assignment) {
+      console.log("No assignment found for app name:", req.params.qrNumber);
+      return res.status(404).json({ message: "Assignment not found" });
     }
 
-    res.json(assignments);
+    console.log("Assignment found:", assignment);
+    res.json(assignment);
   } catch (err) {
-    console.error("Error fetching assignments:", err.message);
+    console.error("Error fetching assignment:", err.message);
     res.status(500).json({ error: err.message });
   }
 });
diff --git a/assignment-service/routes/InstructorRouter.js b/assignment-service/routes/InstructorRouter.js
index c897d86..55af452 100644
--- a/assignment-service/routes/InstructorRouter.js
+++ b/assignment-service/routes/InstructorRouter.js
@@ -154,8 +154,8 @@ intructorRouter.get(
       const response = await axios.get(
         `${DB_ASSIGNMENT_SERVICE_URL}/assignments/appname/${appName}`
       );
-      console.log("exists:", response.data.length > 0);
-      res.status(response.status).json({"exists": response.data.length > 0});
+      console.log("Response data:", response.data);
+      res.status(response.status).json({"exists": (response.data !== null && response.data !== undefined)});
     } catch (error) {
       console.error("Error fetching assignment by app name:", error.message);
       res.status(error.response?.status || 500).json({ error: error.message });
@@ -174,9 +174,8 @@ intructorRouter.get(
       const response = await axios.get(
         `${DB_ASSIGNMENT_SERVICE_URL}/assignments/${qrcode}`
       );
-      console.log("response:", response.data); 
-      console.log("exists:", response.data.length > 0);
-      res.status(response.status).json({"exists": response.data.length > 0});
+      console.log("Response data:", response.data);
+      res.status(response.status).json({"exists": (response.data !== null && response.data !== undefined)});
     } catch (error) {
       console.error("Error fetching assignment by QR code:", error.message);
       res.status(error.response?.status || 500).json({ error: error.message });
diff --git a/assignment-service/routes/StudentRouter.js b/assignment-service/routes/StudentRouter.js
index edb1f57..80f9f79 100644
--- a/assignment-service/routes/StudentRouter.js
+++ b/assignment-service/routes/StudentRouter.js
@@ -45,11 +45,11 @@ studentRouter.post("/verify", async (req, res) => {
 
     console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
     console.log("Password provided:", password);
-    console.log("Password hash from database:", response.data[0].passwordhash);
+    console.log("Password hash from database:", response.data.passwordhash);
 
     const isPasswordValid = await bcrypt.compare(
       password,
-      response.data[0].passwordhash 
+      response.data.passwordhash 
     );
 
     console.log("Password validation result:", isPasswordValid);
diff --git a/auth-service/passport.js b/auth-service/passport.js
index 84e05e3..e04adb9 100644
--- a/auth-service/passport.js
+++ b/auth-service/passport.js
@@ -60,7 +60,7 @@ passport.serializeUser((user, done) => {
   // done(null, user);
   console.log("Serializing user:", user);
   done(null, {
-    id: user.qrcodenumber || user.id,
+    userId: user.qrcodenumber || user.id,
     displayName: user.studentname || user.displayName,
     role: user.role,
     emails: user.emails || "none",