diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index e65c921a4..2d08fe2a2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -60,6 +60,9 @@ public class User extends RealmObject {
 
     public void setPreferences(Preferences preferences) {
         this.preferences = preferences;
+        if (preferences != null && id != null && !preferences.isManaged()) {
+            preferences.setUserId(id);
+        }
     }
 
     public String getId() {