diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
index a36181a04..6b00b712e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
@@ -363,7 +363,8 @@ public class LoginActivity extends BaseActivity
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (this.isRegistering) {
+        
+        if (this.isRegistering || userAuthResponse.getNewUser()) {
             this.startSetupActivity();
         } else {
             JSONObject eventProperties = new JSONObject();
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java
index 8b2f100fd..d2aa5cc36 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java
@@ -7,6 +7,7 @@ public class UserAuthResponse {
     //we need apiToken and token, as both are possible returns
     private String apiToken;
     private String token;
+    private Boolean newUser = false;
     private String id;
 
     public String getToken() {
@@ -36,4 +37,12 @@ public class UserAuthResponse {
     public void setId(String id) {
         this.id = id;
     }
+
+    public Boolean getNewUser() {
+        return newUser;
+    }
+
+    public void setNewUser(Boolean newUser) {
+        this.newUser = newUser;
+    }
 }