Sára Juhošová
--- a/src/main/java/nl/tudelft/ewi/queue/service/CourseService.java
+++ b/src/main/java/nl/tudelft/ewi/queue/service/CourseService.java
+	 */
+	private User findImportedUser(String identifier) {
+		User user;
+		int num = 0;
+
+		try {
+			num = Integer.parseInt(identifier);
+			user = userRepository.findByStudentNumber(num);
+		} catch (NumberFormatException nfe) {
+			user = userRepository.findByUsername(identifier + "@tudelft.nl");
+		}
+
 		if (user == null) {
-			user = new User(netid + "@tudelft.nl", "", netid, "",
-					DefaultRole.ROLE_STUDENT, 0);
+			user = new User(identifier + "@tudelft.nl", "", identifier, "",