diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt b/app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt
index ef99a082..fcf33c02 100644
--- a/app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt
+++ b/app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt
@@ -8,7 +8,7 @@ data class Invite(
     val coupleId: String? = null,
     val status: String = "pending",
     val createdAt: Long = System.currentTimeMillis(),
-    val expiresAt: Long = System.currentTimeMillis() + 7 * 24 * 60 * 60 * 1000L,
+    val expiresAt: Long = System.currentTimeMillis() + 24 * 60 * 60 * 1000L,
     val acceptedAt: Long? = null,
     val acceptedByUserId: String? = null
 )
diff --git a/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt b/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt
index 171e65f2..1d25c81f 100644
--- a/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt
+++ b/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt
@@ -56,7 +56,7 @@ fun CreateProfileScreen(
     val focusManager = LocalFocusManager.current
 
     LaunchedEffect(state.success) {
-        if (state.success) onNavigate(AppRoute.CREATE_INVITE)
+        if (state.success) onNavigate(AppRoute.HOME)
     }
     LaunchedEffect(state.error) {
         state.error?.let { snackbar.showSnackbar(it); viewModel.dismissError() }
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index ff836a11..2b73765c 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <full-backup-content>
-    <include domain="sharedpref" path="."/>
-    <include domain="database" path="."/>
+    <exclude domain="sharedpref" path="local_answers" />
+    <exclude domain="database" path="." />
 </full-backup-content>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index faeee0e7..e0e5ebfe 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-extraction-rules>
-    <include domain="sharedpref" path="."/>
-    <include domain="database" path="."/>
+    <cloud-backup>
+        <exclude domain="sharedpref" path="local_answers" />
+        <exclude domain="database" path="." />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="sharedpref" path="local_answers" />
+        <exclude domain="database" path="." />
+    </device-transfer>
 </data-extraction-rules>
diff --git a/firestore.rules b/firestore.rules
index 089f020d..53a815b4 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -44,6 +44,10 @@ service cloud.firestore {
     match /couples/{coupleId} {
       allow read, write: if isCouplesMember(coupleId);
 
+      match /sessions/{sessionId} {
+        allow read, write: if isCouplesMember(coupleId);
+      }
+
       // Question threads live under the couple document.
       match /question_threads/{threadId} {
         allow read, write: if isCouplesMember(coupleId);