diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java
index afa414a..a6a87ad 100644
--- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java
+++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java
@@ -2,7 +2,6 @@
 
 import java.util.UUID;
 
-// TODO: Passord må hashes!!!
 // TODO: Unntakshåndtering mangler
 // TODO: Enhetstesting mangler
 
@@ -12,10 +11,12 @@
  * @author Robin Strand Prestmo
  */
 public class User {
+  private static final PasswordHasher passwordHasher = new PasswordHasher();
+
   private final UUID id;
   private String name;
   private String email;
-  private String password;
+  private String passwordHash;
   private final String role;
   private final Settings settings;
   private final Inbox inbox;
@@ -43,7 +44,7 @@ public User(UUID id,
     this.id = id;
     this.name = name;
     this.email = email;
-    this.password = password;
+    this.passwordHash = passwordHasher.getHashPassword(password);
     this.role = role;
     this.settings = settings;
     this.inbox = inbox;
@@ -77,16 +78,21 @@ public Inbox getInbox() {
 
   // Add Setters
 
-
   public void setName(String name) {
     this.name = name;
   }
 
   public void setPassword(String password) {
-    this.password = password;
+    this.passwordHash = passwordHasher.getHashPassword(password);
   }
 
   public void setEmail(String email) {
     this.email = email;
   }
-}
+
+  // Other methods
+
+  public boolean checkPassword(String password) {
+    return passwordHasher.isValidPassword(password, passwordHash);
+  }
+}
\ No newline at end of file