diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
index 34b8bf6d6b0..2580c2c8a6f 100644
--- a/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
@@ -24,7 +24,7 @@ void runSync(void* context, NSDictionary *params) {
         NSString *uri = credential[@"uri"];
         NSString *username = credential[@"username"];
         
-        // Skip credentials with null username
+        // Skip credentials with null username since MacOS crashes if we send credentials with empty usernames
         if ([username isKindOfClass:[NSNull class]] || username.length == 0) {
             NSLog(@"Skipping credential, username is empty: %@", credential);
           continue;
@@ -42,8 +42,8 @@ void runSync(void* context, NSDictionary *params) {
           NSString *cipherId = credential[@"cipherId"];
           NSString *rpId = credential[@"rpId"];
           NSString *userName = credential[@"userName"];
-          
-          // Skip credentials with null userName
+
+          // Skip credentials with null username since MacOS crashes if we send credentials with empty usernames
           if ([userName isKindOfClass:[NSNull class]] || userName.length == 0) {
             NSLog(@"Skipping credential, username is empty: %@", credential);
             continue;
diff --git a/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift b/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
index b230e502db0..25871ceb5b2 100644
--- a/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
+++ b/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
@@ -467,8 +467,8 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
                 clientDataHash: requestParameters.clientDataHash,
                 userVerification: userVerification,
                 allowedCredentials: requestParameters.allowedCredentials,
-                windowXy: windowPosition
-                //extensionInput: requestParameters.extensionInput,
+                windowXy: windowPosition,
+                extensionInput: requestParameters.extensionInput
             )
             
             let client = await getClient()