diff --git a/Session/Onboarding/Onboarding.swift b/Session/Onboarding/Onboarding.swift
index 924536923..dc89f53b5 100644
--- a/Session/Onboarding/Onboarding.swift
+++ b/Session/Onboarding/Onboarding.swift
@@ -12,6 +12,8 @@ enum Onboarding {
             TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = x25519PublicKey
             Storage.writeSync { transaction in
                 let user = Contact(sessionID: x25519PublicKey)
+                user.isApproved = true
+                user.didApproveMe = true
                 Storage.shared.setContact(user, using: transaction)
             }
             switch self {
diff --git a/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift b/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift
index e22c31aaa..d1fe7cf24 100644
--- a/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift
+++ b/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift
@@ -41,6 +41,13 @@ public class MessageRequestsMigration : OWSDatabaseMigration {
             threads.append(thread)
         }
         
+        if let user = Storage.shared.getUser() {
+            user.isApproved = true
+            user.didApproveMe = true
+            contacts.insert(user)
+        }
+        
+        
         Storage.write(with: { transaction in
             contacts.forEach { contact in
                 Storage.shared.setContact(contact, using: transaction)