diff --git a/cp/app/Controllers/ProfileController.php b/cp/app/Controllers/ProfileController.php
index c526178..eb62989 100644
--- a/cp/app/Controllers/ProfileController.php
+++ b/cp/app/Controllers/ProfileController.php
@@ -68,12 +68,14 @@ class ProfileController extends Controller
             'SELECT * FROM users_webauthn WHERE user_id = ? ORDER BY created_at DESC LIMIT 5',
             [$userId]
         );
+        $isWebAuthnEnabled = (envi('WEB_AUTHN_ENABLED') === 'true') ? true : false;
+
         if ($is_2fa_activated) {
             return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue]);
         } else if ($is_weba_activated) {
             return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue, 'weba' => $is_weba_activated]);
         } else {
-            return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue]);
+            return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue, 'isWebaEnabled' => $isWebAuthnEnabled]);
         }
 
     }
diff --git a/cp/resources/views/admin/profile/profile.twig b/cp/resources/views/admin/profile/profile.twig
index 813d1f5..6eb450b 100644
--- a/cp/resources/views/admin/profile/profile.twig
+++ b/cp/resources/views/admin/profile/profile.twig
@@ -177,11 +177,25 @@
                     </div>
                   </div>
                   {% else %}
+                  {% if isWebaEnabled %}
                   <div class="card-body">
                     <h3 class="card-title">{{ __('WebAuthn Authentication') }}</h3>
                     <p>{{ __('Secure your account with WebAuthn. Click the button below to register your device for passwordless sign-in.') }}</p>
                     <button type="button" class="btn btn-primary" id="connectWebAuthnButton">{{ __('Connect WebAuthn Device') }}</button>
                   </div>
+                  {% else %}
+                  <div class="card-body">
+                    <h3 class="card-title">{{ __('WebAuthn Authentication') }}<span class="badge bg-red text-red-fg ms-2">{{ __('Disabled') }}</span></h3>
+                    <p>{{ __('WebAuthn is currently disabled for this installation. To enable WebAuthn authentication, follow these steps:') }}</p>
+                    <ol>
+                      <li>{{ __('Edit the environment configuration file located at:') }} <code>/var/www/cp/.env</code></li>
+                      <li>{{ __('Find or add the following line:') }}</li>
+                      <pre><code>WEB_AUTHN_ENABLED=true</code></pre>
+                      <li>{{ __('Save the changes and reload the server (Caddy) using the following command:') }}</li>
+                      <pre><code>sudo systemctl reload caddy</code></pre>
+                    </ol>
+                  </div>
+                  {% endif %}
                   {% endif %}
                 </div>
                 <div class="card tab-pane" id="tabs-log">
diff --git a/cp/resources/views/partials/js-profile.twig b/cp/resources/views/partials/js-profile.twig
index 0f26134..021c932 100644
--- a/cp/resources/views/partials/js-profile.twig
+++ b/cp/resources/views/partials/js-profile.twig
@@ -5,7 +5,7 @@
     var table;
 
     document.addEventListener("DOMContentLoaded", function(){
-    
+{% if isWebaEnabled %}
     const connectButton = document.getElementById('connectWebAuthnButton');
 
     connectButton.addEventListener('click', async function() {
@@ -124,7 +124,7 @@
         }
         return window.btoa(binary);
     }
-
+{% endif %}
     table = new Tabulator("#auditTable", {
         ajaxURL:"/api/records/users_audit", // Set the URL for your JSON data
         ajaxConfig:"GET",