diff --git a/config/webauthn.php b/config/webauthn.php
index 378f19d89d3..1c11897fa03 100644
--- a/config/webauthn.php
+++ b/config/webauthn.php
@@ -2,6 +2,17 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Enable passkey login
+    |--------------------------------------------------------------------------
+    |
+    | Whether or not the passkey feature should be enabled,
+    |
+    */
+
+    'enable_login_with_passkey' => env('STATAMIC_PASSKEY_ENABLED', true),
+
     /*
     |--------------------------------------------------------------------------
     | Allow password logins to be used when user has a passkey
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index e0fcd99e480..56020fc07cc 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -18,7 +18,7 @@
                     </template>
                     <DropdownMenu>
                         <DropdownItem :text="__('Edit Blueprint')" icon="blueprint-edit" v-if="canEditBlueprint" :href="actions.editBlueprint" />
-                        <DropdownItem :text="__('Passkeys')" icon="key" :href="cp_url('passkeys')" />
+                        <DropdownItem :text="__('Passkeys')" icon="key" :href="cp_url('passkeys')" v-if="passkeyEnabled" />
                         <DropdownSeparator v-if="canEditBlueprint && itemActions.length" />
                         <DropdownItem
                             v-for="action in itemActions"
@@ -122,6 +122,7 @@ export default {
         canEditBlueprint: Boolean,
         requiresCurrentPassword: Boolean,
         twoFactor: Object,
+        passkeyEnabled: Boolean
     },
 
     data() {
diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue
index c41ae7cf788..2bfb12156e4 100644
--- a/resources/js/pages/auth/Login.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -11,6 +11,7 @@ defineOptions({ layout: Outside });
 const props = defineProps([
     'errors',
     'emailLoginEnabled',
+    'passkeyEnabled',
     'passkeyOptionsUrl',
     'passkeyVerifyUrl',
     'oauthEnabled',
@@ -55,7 +56,7 @@ const submit = () => {
 const passkey = usePasskey();
 
 const showPasskeyLogin = computed(() => {
-    return props.emailLoginEnabled && passkey.supported;
+     return props.passkeyEnabled && props.emailLoginEnabled && passkey.supported;
 })
 
 const emailAutocomplete = computed(() => {
@@ -111,7 +112,7 @@ onMounted(() => {
                     <template #actions>
                         <Link
                             :href="forgotPasswordUrl"
-                            class="text-ui-accent-text text-sm hover:text-ui-accent-text/80"
+                            class="text-sm text-ui-accent-text hover:text-ui-accent-text/80"
                             tabindex="6"
                             v-text="__('Forgot password?')"
                         />
@@ -137,7 +138,7 @@ onMounted(() => {
                         />
                         <ErrorMessage v-if="passkey.error.value" :text="passkey.error.value" />
                     </template>
-                    <div v-if="showOAuth" class="flex gap-4 justify-center items-center">
+                    <div v-if="showOAuth" class="flex items-center justify-center gap-4">
                         <Button
                             v-for="provider in providers"
                             :key="provider.name"
diff --git a/resources/js/pages/users/Edit.vue b/resources/js/pages/users/Edit.vue
index 4a6f3304d04..43afe49fb02 100644
--- a/resources/js/pages/users/Edit.vue
+++ b/resources/js/pages/users/Edit.vue
@@ -15,11 +15,12 @@ defineProps([
     'itemActions',
     'itemActionUrl',
     'twoFactor',
+    'passkeyEnabled'
 ]);
 </script>
 
 <template>
-    <div class="max-w-5xl 3xl:max-w-6xl mx-auto" data-max-width-wrapper>
+    <div class="max-w-5xl mx-auto 3xl:max-w-6xl" data-max-width-wrapper>
         <Head :title="__('Edit User')" />
 
         <UserPublishForm
@@ -37,6 +38,7 @@ defineProps([
             :initial-item-actions="itemActions"
             :item-action-url="itemActionUrl"
             :two-factor="twoFactor"
+            :passkey-enabled="passkeyEnabled"
         />
     </div>
 </template>
\ No newline at end of file
diff --git a/src/Http/Controllers/CP/Auth/LoginController.php b/src/Http/Controllers/CP/Auth/LoginController.php
index c8f8d3c5406..1b4dbfa25b0 100644
--- a/src/Http/Controllers/CP/Auth/LoginController.php
+++ b/src/Http/Controllers/CP/Auth/LoginController.php
@@ -44,6 +44,7 @@ public function showLoginForm(Request $request)
             'referer' => $this->getReferrer($request),
             'forgotPasswordUrl' => cp_route('password.request'),
             'submitUrl' => cp_route('login'),
+            'passkeyEnabled' => config('statamic.webauthn.enable_login_with_passkey'),
             'passkeyOptionsUrl' => cp_route('passkeys.auth.options'),
             'passkeyVerifyUrl' => cp_route('passkeys.auth'),
         ]);
diff --git a/src/Http/Controllers/CP/Auth/PasskeyController.php b/src/Http/Controllers/CP/Auth/PasskeyController.php
index 85c4ab9b355..b72eb08a52d 100644
--- a/src/Http/Controllers/CP/Auth/PasskeyController.php
+++ b/src/Http/Controllers/CP/Auth/PasskeyController.php
@@ -14,6 +14,11 @@ class PasskeyController
 {
     public function index()
     {
+        // redirect if passkeys are disabled
+        if (! config('statamic.webauthn.enable_login_with_passkey')) {
+            return redirect(cp_route('users.edit', User::current()->id()));
+        }
+
         return Inertia::render('users/Passkeys', [
             'passkeys' => User::current()->passkeys()->map(function (Passkey $passkey) {
                 return [
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index d83f2108770..7220ab181f4 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -290,6 +290,7 @@ public function edit(Request $request, $user)
                     ],
                 ],
             ] : null,
+            'passkeyEnabled' => config('statamic.webauthn.enable_login_with_passkey'),
         ];
 
         if ($request->wantsJson()) {
