diff --git a/app/src/main/java/com/github/libretube/api/obj/Login.kt b/app/src/main/java/com/github/libretube/api/obj/Login.kt
index 0636d72d9..eb8411491 100644
--- a/app/src/main/java/com/github/libretube/api/obj/Login.kt
+++ b/app/src/main/java/com/github/libretube/api/obj/Login.kt
@@ -1,9 +1,9 @@
 package com.github.libretube.api.obj
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import kotlinx.serialization.Serializable
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+@Serializable
 data class Login(
-    val username: String? = null,
-    val password: String? = null
+    val username: String,
+    val password: String
 )
diff --git a/app/src/main/java/com/github/libretube/api/obj/Token.kt b/app/src/main/java/com/github/libretube/api/obj/Token.kt
index 6f49ff7e8..a551dc727 100644
--- a/app/src/main/java/com/github/libretube/api/obj/Token.kt
+++ b/app/src/main/java/com/github/libretube/api/obj/Token.kt
@@ -1,9 +1,9 @@
 package com.github.libretube.api.obj
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import kotlinx.serialization.Serializable
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+@Serializable
 data class Token(
-    var token: String? = null,
-    var error: String? = null
+    val token: String? = null,
+    val error: String? = null
 )
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
index d0306a2a8..b6287ce05 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
@@ -92,8 +92,8 @@ class LoginDialog : DialogFragment() {
                 Toast.LENGTH_SHORT
             ).show()
 
-            PreferenceHelper.setToken(response.token!!)
-            PreferenceHelper.setUsername(login.username!!)
+            PreferenceHelper.setToken(response.token)
+            PreferenceHelper.setUsername(login.username)
 
             dialog?.dismiss()
             activity?.recreate()