diff --git a/src/main/java/dao/ResultDAO.java b/src/main/java/dao/ResultDAO.java
index 6fb0bfa..6230e3e 100644
--- a/src/main/java/dao/ResultDAO.java
+++ b/src/main/java/dao/ResultDAO.java
@@ -171,24 +171,25 @@
 		}
 	}
 
-	public Student findStudent(String id) {
+	public Student findStudent(String submissionId) {
 
 		try (
 			 Connection con = JdbcConnection.getConnection();  PreparedStatement stmt = con.prepareStatement("select * from student where submission_id = ?")) {
 
-			stmt.setString(1, id);
+			stmt.setString(1, submissionId);
 
 			ResultSet rs = stmt.executeQuery();
 
 			if (rs.next()) {
 
+				String id = rs.getString("student_id");
 				String username = rs.getString("username");
 				String firstName = rs.getString("first_name");
 				String lastName = rs.getString("last_name");
 				String email = rs.getString("email");
 				Boolean sendFeedback = rs.getBoolean("send_feedback");
 				Boolean emailSent = rs.getBoolean("email_sent");
-				Student s = new Student(id, username, firstName, lastName, email, sendFeedback, emailSent);
+				Student s = new Student(id, submissionId, username, firstName, lastName, email, sendFeedback, emailSent);
 
 				return s;
 			}
@@ -214,13 +215,14 @@
 
 			while (studsRs.next()) {
 				String id = studsRs.getString("student_id");
+				String submissionId = studsRs.getString("submission_id");
 				String firstName = studsRs.getString("first_name");
 				String lastName = studsRs.getString("last_name");
 				String username = studsRs.getString("username");
 				String email = studsRs.getString("email");
 				Boolean sendFeedback = studsRs.getBoolean("send_feedback");
 				Boolean emailSent = studsRs.getBoolean("email_sent");
-				Student s = new Student(id, username, firstName, lastName, email, sendFeedback, emailSent);
+				Student s = new Student(id, submissionId, username, firstName, lastName, email, sendFeedback, emailSent);
 				students.add(s);
 			}
 		} catch (SQLException ex) {