diff --git a/apps/web/src/stores/app-store.ts b/apps/web/src/stores/app-store.ts
index 46a995594..558aa07c2 100644
--- a/apps/web/src/stores/app-store.ts
+++ b/apps/web/src/stores/app-store.ts
@@ -118,7 +118,9 @@ class AppStore extends BaseStore<AppStore> {
       async (full, force, lastSynced) => {
         if (!this.get().isAutoSyncEnabled) return;
 
-        // await this.get().sync(full, force, lastSynced);
+        // TODO: remove this
+        if ((await db.lastSynced()) === 0)
+          await this.get().sync(full, force, lastSynced);
       }
     );
 
diff --git a/apps/web/src/stores/user-store.ts b/apps/web/src/stores/user-store.ts
index 53fa6d599..7b47bf76c 100644
--- a/apps/web/src/stores/user-store.ts
+++ b/apps/web/src/stores/user-store.ts
@@ -122,7 +122,7 @@ class UserStore extends BaseStore<UserStore> {
         await db.user.authenticatePassword(
           email,
           password,
-          null,
+          undefined,
           sessionExpired
         );
         Config.set("encryptBackups", true);