diff --git a/app/src/main/java/sh/sar/gridflow/AddAccountActivity.kt b/app/src/main/java/sh/sar/gridflow/AddAccountActivity.kt
index 673913b..6bc917e 100644
--- a/app/src/main/java/sh/sar/gridflow/AddAccountActivity.kt
+++ b/app/src/main/java/sh/sar/gridflow/AddAccountActivity.kt
@@ -124,7 +124,7 @@ class AddAccountActivity : AppCompatActivity() {
                         // Create new account object
                         val newAccount = Account(
                             id = mobile,
-                            name = result.data.name,
+                            name = result.data.name ?: "",
                             mobile = mobile,
                             email = result.data.email,
                             password = password,
diff --git a/app/src/main/java/sh/sar/gridflow/LoginActivity.kt b/app/src/main/java/sh/sar/gridflow/LoginActivity.kt
index d6ae7ad..f9aff32 100644
--- a/app/src/main/java/sh/sar/gridflow/LoginActivity.kt
+++ b/app/src/main/java/sh/sar/gridflow/LoginActivity.kt
@@ -128,7 +128,7 @@ class LoginActivity : AppCompatActivity() {
                                 // Create new account object
                                 val newAccount = Account(
                                     id = mobile,
-                                    name = result.data.name,
+                                    name = result.data.name ?: "",
                                     mobile = mobile,
                                     email = result.data.email,
                                     password = password,
diff --git a/app/src/main/java/sh/sar/gridflow/data/Models.kt b/app/src/main/java/sh/sar/gridflow/data/Models.kt
index 8cbc8b3..0187f21 100644
--- a/app/src/main/java/sh/sar/gridflow/data/Models.kt
+++ b/app/src/main/java/sh/sar/gridflow/data/Models.kt
@@ -19,7 +19,7 @@ data class ForgotPasswordRequest(
 
 data class LoginResponse(
     val id: Int,
-    val name: String,
+    val name: String?,
     val mobile: String,
     val email: String,
     val createdAt: String,