diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte
index 07c7c5ec93..6956aba237 100644
--- a/src/routes/console/(migration-wizard)/resource-form.svelte
+++ b/src/routes/console/(migration-wizard)/resource-form.svelte
@@ -15,6 +15,7 @@
         resourcesToMigrationForm
     } from '$lib/stores/migration';
     import { addNotification } from '$lib/stores/notifications';
+    import { wizard } from '$lib/stores/wizard';
 
     export let formData: ReturnType<typeof createMigrationFormStore>;
     export let provider: ReturnType<typeof createMigrationProviderStore>;
@@ -100,6 +101,12 @@
                 case 'firebase': {
                     if ($provider.projectId) {
                         // OAuth
+                        const res = await sdk.forProject.migrations.getFirebaseReportOAuth(
+                            providerResources.firebase,
+                            $provider.projectId
+                        );
+
+                        report = res;
                     } else if ($provider.serviceAccount) {
                         // Manual auth
                         const res = await sdk.forProject.migrations.getFirebaseReport(
@@ -139,7 +146,7 @@
 
     $: resources = providerResources[$provider.provider];
 
-    // $: wizard.setNextDisabled(!report);
+    $: wizard.setNextDisabled(!report);
 </script>
 
 <div class="box" style:border-radius="0.5rem">
diff --git a/src/routes/console/(migration-wizard)/wizard.svelte b/src/routes/console/(migration-wizard)/wizard.svelte
index 397fae0e5b..73697d657e 100644
--- a/src/routes/console/(migration-wizard)/wizard.svelte
+++ b/src/routes/console/(migration-wizard)/wizard.svelte
@@ -20,7 +20,7 @@
         const resources = migrationFormToResources($formData);
         if ($provider.provider !== 'appwrite') return;
 
-        await getSdkForProject($selectedProject).migrations.migrateAppwrite(
+        await getSdkForProject($selectedProject).migrations.createAppwriteMigration(
             resources,
             $provider.endpoint,
             $provider.projectID,
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
index 2800ff2498..46d6ca3045 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
@@ -135,10 +135,7 @@
                     }))} />
             </FormList>
             <p class="u-text-center u-margin-block-start-24">
-                Signed in
-                <button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>
-                    Sign Out?
-                </button>
+                <button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>Sign Out</button>
             </p>
         {/if}
     {:else if $provider.provider === 'supabase'}
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
index 9bf9a37600..f2b0e5eefb 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
@@ -51,6 +51,11 @@
                 case 'firebase': {
                     if ($provider.projectId) {
                         // OAuth
+                        const res = await sdk.forProject.migrations.createFirebaseOAuthMigration(
+                            resources,
+                            $provider.projectId
+                        );
+
                     } else if ($provider.serviceAccount) {
                         // Manual auth
                         await sdk.forProject.migrations.createFirebaseMigration(
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.ts b/src/routes/console/project-[project]/settings/migrations/+page.ts
index cad26bcbf2..89af9aa914 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.ts
+++ b/src/routes/console/project-[project]/settings/migrations/+page.ts
@@ -6,7 +6,7 @@ async function getFirebaseProjects() {
         const res = await sdk.forProject.migrations.listFirebaseProjects();
         return res.projects;
     } catch (e) {
-        if (e.code === 401) {
+        if (e.type === 'user_identity_not_found') {
             return [];
         } else {
             throw e;