diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/key-shitore.properties b/infrastructure/eid-wallet/src-tauri/gen/android/key-shitore.properties
deleted file mode 100644
index 7ebcd924e..000000000
--- a/infrastructure/eid-wallet/src-tauri/gen/android/key-shitore.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-password=$th3r3a1m3ru1
-keyAlias=key0
-storeFile=/home/merul/Stuff/msf-android-keys/Untitled
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
index c4a4ba695..f2ab95132 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
@@ -8,7 +8,6 @@ import {
 } from "$env/static/public";
 import { Hero } from "$lib/fragments";
 import { GlobalState } from "$lib/global";
-import NotificationService from "$lib/services/NotificationService";
 import { pendingRecovery } from "$lib/stores/pendingRecovery";
 import { ButtonAction } from "$lib/ui";
 import { capitalize, getCanonicalBindingDocString } from "$lib/utils";
@@ -19,9 +18,6 @@ import { Shadow } from "svelte-loading-spinners";
 import { v4 as uuidv4 } from "uuid";
 import { provision } from "wallet-sdk";
 
-let pushToken = $state<string | undefined>(undefined);
-let pushTokenError = $state<string | undefined>(undefined);
-let pushTokenLoading = $state(true);
 const ANONYMOUS_VERIFICATION_CODE = "d66b7138-538a-465f-a6ce-f6985854c3f4";
 const KEY_ID = "default";
 
@@ -735,18 +731,6 @@ const handleEnamePassphraseRecovery = async () => {
 };
 
 onMount(async () => {
-    // Fetch push notification token for display (Android/iOS)
-    try {
-        pushToken = await NotificationService.getInstance().getPushToken();
-        if (!pushToken)
-            pushTokenError = "No token (desktop or permission denied)";
-    } catch (e) {
-        pushTokenError =
-            e instanceof Error ? e.message : "Failed to get push token";
-    } finally {
-        pushTokenLoading = false;
-    }
-
     // Detect upgrade mode from query param
     const url = new URL(window.location.href);
     if (url.searchParams.get("upgrade") === "1") {
@@ -762,16 +746,6 @@ onMount(async () => {
     class="min-h-svh px-[5vw] flex flex-col justify-between"
     style="padding-top: max(4svh, env(safe-area-inset-top)); padding-bottom: max(16px, env(safe-area-inset-bottom));"
 >
-    <section class="mb-4 p-2 rounded bg-gray-100 text-xs">
-        <p class="font-medium text-gray-600 mb-1">Push token (FCM/APNs):</p>
-        {#if pushTokenLoading}
-            <span class="text-gray-500">Loading...</span>
-        {:else if pushToken}
-            <code class="block break-all text-gray-800">{pushToken}</code>
-        {:else}
-            <span class="text-amber-600">{pushTokenError ?? "—"}</span>
-        {/if}
-    </section>
     <article class="flex justify-center mb-4">
         <img
             class="w-[88vw] h-[39svh]"
diff --git a/infrastructure/evault-core/src/services/BindingDocumentService.ts b/infrastructure/evault-core/src/services/BindingDocumentService.ts
index 6bac1cf06..45e99c54f 100644
--- a/infrastructure/evault-core/src/services/BindingDocumentService.ts
+++ b/infrastructure/evault-core/src/services/BindingDocumentService.ts
@@ -220,6 +220,7 @@ export class BindingDocumentService {
         const expectedHash = computeBindingDocumentHash(docToVerify);
         const hasLegacyHashSignature = input.ownerSignature.signature === expectedHash;
         const isProvisionerSigner = /^https?:\/\//.test(input.ownerSignature.signer);
+
         const hasValidUserSignature =
             !hasLegacyHashSignature &&
             !isProvisionerSigner &&
@@ -228,6 +229,7 @@ export class BindingDocumentService {
                 input.ownerSignature.signature,
                 docToVerify,
             ));
+
         if (!hasLegacyHashSignature && !isProvisionerSigner && !hasValidUserSignature) {
             throw new ValidationError("Invalid owner signature");
         }