diff --git a/src/main/java/NTNU/IDATT1002/controllers/Login.java b/src/main/java/NTNU/IDATT1002/controllers/Login.java
index fb49fe3258c009cbdca0a37f90ea084f5f03daf9..8eae735ed82918730dc6d03317d3049effc1e4ff 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Login.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Login.java
@@ -3,6 +3,8 @@ package NTNU.IDATT1002.controllers;
 import java.io.IOException;
 
 import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.ApplicationState;
+import NTNU.IDATT1002.models.User;
 import NTNU.IDATT1002.service.UserService;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
diff --git a/src/main/java/NTNU/IDATT1002/service/UserService.java b/src/main/java/NTNU/IDATT1002/service/UserService.java
index 426c59263fe752bf7ec72f50c40d20d67d8a9187..e14166e242b46f8ff208914ec753f484743da50b 100644
--- a/src/main/java/NTNU/IDATT1002/service/UserService.java
+++ b/src/main/java/NTNU/IDATT1002/service/UserService.java
@@ -1,5 +1,6 @@
 package NTNU.IDATT1002.service;
 
+import NTNU.IDATT1002.App;
 import NTNU.IDATT1002.ApplicationState;
 import NTNU.IDATT1002.models.Login;
 import NTNU.IDATT1002.models.User;
@@ -70,7 +71,10 @@ public class UserService {
             if (login.isPresent()) {
                 String salt = login.get().getPasswordSalt();
                 String hash = login.get().getHash();
-                return Authentication.isCorrectPassword(salt, password, hash);
+                if(Authentication.isCorrectPassword(salt, password, hash)) {
+                    ApplicationState.setCurrentUser(login.get().getUser());
+                    return true;
+                }
             }
         }
         catch (IllegalArgumentException e) {