diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index b6b706a7a..0154986e4 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="97"
+    android:versionCode="99"
     android:versionName="0.0.31.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/assets/migrations/Habitica/23.sql b/Habitica/assets/migrations/Habitica/23.sql
new file mode 100644
index 000000000..b2f264eb2
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/23.sql
@@ -0,0 +1,2 @@
+ALTER TABLE HabitRPGUser ADD COLUMN 'contributor_id' INTEGER;
+ALTER TABLE HabitRPGUser ADD COLUMN 'inbox_id' INTEGER;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 27851422c..cccff4c5a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -288,11 +288,11 @@ public class HabitRPGUser extends BaseModel {
         preferences.user_id = id;
         stats.id = id;
         profile.user_Id = id;
-        inbox.user_Id = id;
+        if (inbox != null) { inbox.user_Id = id; }
         items.user_id = id;
         authentication.user_id = id;
         flags.user_id = id;
-        contributor.user_id = id;
+        if (contributor != null) { contributor.user_id = id; }
 
         ArrayList<Task> allTasks = new ArrayList<Task>();
         if (dailys != null) {