diff --git a/src/main/scala/de/tobias/playpad/server/account/Account.scala b/src/main/scala/de/tobias/playpad/server/account/Account.scala
index cf90d87002e615777ba99ab0fc3c83a0df718743..410d6704b5324c06c20e06c23e8085219e79ee5e 100644
--- a/src/main/scala/de/tobias/playpad/server/account/Account.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/Account.scala
@@ -21,4 +21,19 @@ import com.j256.ormlite.table.DatabaseTable
 	}
 
 	def getId: Int = id
+
+
+	def canEqual(other: Any): Boolean = other.isInstanceOf[Account]
+
+	override def equals(other: Any): Boolean = other match {
+		case that: Account =>
+			(that canEqual this) &&
+				id == that.id
+		case _ => false
+	}
+
+	override def hashCode(): Int = {
+		val state = Seq(id)
+		state.map(_.hashCode()).foldLeft(0)((a, b) => 31 * a + b)
+	}
 }
diff --git a/src/main/scala/de/tobias/playpad/server/account/Session.scala b/src/main/scala/de/tobias/playpad/server/account/Session.scala
index 32f8ea3cc4e2f6aa0ed6fbddb87ea152b167c795..dbece99539b83ae64bdbae7b631c351573dbf2c2 100644
--- a/src/main/scala/de/tobias/playpad/server/account/Session.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/Session.scala
@@ -25,6 +25,7 @@ import scala.util.Random
 	}
 
 	def getId: Int = id
+	def getAccount: Account = account
 }
 
 object Session {
diff --git a/src/main/scala/de/tobias/playpad/server/server/Result.scala b/src/main/scala/de/tobias/playpad/server/server/Result.scala
index 5483dd5c4c18c697bdd453f77e22149a4eb100ec..83933be35b145b612cca950dc2c2877a16c6d3df 100644
--- a/src/main/scala/de/tobias/playpad/server/server/Result.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/Result.scala
@@ -5,12 +5,12 @@ package de.tobias.playpad.server.server
   */
 class Result {
 
-	var status: Status.Value = _
+	var status: String = _
 	var message: String = _
 
 	def this(status: Status.Value, message: String = "") {
 		this()
-		this.status = status
+		this.status = status.toString
 		this.message = message
 	}
 }
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala b/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala
index 4b3fe88ff8ff6eaa7d9cc9ba43cd6bc336101b21..1a00aab80b8ff94a26090e500be76e505b099bdd 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala
@@ -33,13 +33,13 @@ class SessionPost(accountDao: Dao[Account, Int]) extends Route {
 	}
 
 	private class SessionPostResult {
-		var status: Status.Value = _
+		var status: String = _
 		var message: String = _
 		var key: String = _
 
 		def this(status: Status.Value, key: String, message: String = "") {
 			this()
-			this.status = status
+			this.status = status.toString
 			this.message = message
 			this.key = key
 		}
diff --git a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala b/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
index 9ef94035de7c2460218e2e6d32fbd4e709f9949a..82271bc6a4274db03474292a0c4858d6d2604c85 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
@@ -16,7 +16,8 @@ class PropertiesSettingsHandler extends SettingsLoader with SettingsSaver {
 		properties.load(Files.newBufferedReader(path))
 
 		val settings = new Settings()
-		classOf[Settings].getDeclaredFields.filter(f => !Modifier.isTransient(f.getModifiers))
+		classOf[Settings].getDeclaredFields
+			.filter(f => !Modifier.isTransient(f.getModifiers))
 			.filter(f => properties.containsKey(f.getName))
 			.foreach(f => {
 				f.setAccessible(true)
@@ -33,9 +34,8 @@ class PropertiesSettingsHandler extends SettingsLoader with SettingsSaver {
 	override def save(settings: Settings, path: Path): Unit = {
 		val properties = new Properties()
 
-		println("Save")
-
-		classOf[Settings].getDeclaredFields.filter(f => !Modifier.isTransient(f.getModifiers))
+		classOf[Settings].getDeclaredFields
+			.filter(f => !Modifier.isTransient(f.getModifiers))
 			.foreach(f => {
 				f.setAccessible(true)
 				properties.setProperty(f.getName, f.get(settings).toString)
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala b/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
index 0d2d072c18506ebb3f698d93f7e1e8451b83e7f1..6544a9c2004810bc505b1f75393df05360cba8c4 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
@@ -11,5 +11,5 @@ trait SettingsSaver {
 	@throws[IOException]
 	def save(settings: Settings, path: Path)
 
-	def default(path: Path) = save(new Settings(), path)
+	def default(path: Path): Unit = save(new Settings(), path)
 }