diff --git a/server.py b/server.py
index 9098ec5f..f636427b 100644
--- a/server.py
+++ b/server.py
@@ -162,6 +162,8 @@ def fake_data():
     m3 = Mailbox.create(user_id=user.id, email="m3@cd.ef", verified=True)
     db.session.commit()
 
+    user.default_mailbox_id = m1.id
+
     GenEmail.create_new(user.id, "e1@", mailbox_id=m1.id)
     GenEmail.create_new(user.id, "e2@", mailbox_id=m3.id)
 
diff --git a/shell.py b/shell.py
index 1f12c28d..39607d0e 100644
--- a/shell.py
+++ b/shell.py
@@ -54,6 +54,7 @@ def convert_user_full_mailbox(user):
 
     # finally set user to full_mailbox
     user.full_mailbox = True
+    user.default_mailbox_id = default_mb.id
     db.session.commit()