diff --git a/src/nvhttp.cpp b/src/nvhttp.cpp
index 32737184202..f03be3c76b9 100644
--- a/src/nvhttp.cpp
+++ b/src/nvhttp.cpp
@@ -1199,6 +1199,7 @@ namespace nvhttp {
   erase_all_clients() {
     client_t client;
     client_root = client;
+    cert_chain.clear();
     save_state();
   }
 
diff --git a/src_assets/common/assets/web/pin.html b/src_assets/common/assets/web/pin.html
index 7bb54662a07..43c80a2f886 100644
--- a/src_assets/common/assets/web/pin.html
+++ b/src_assets/common/assets/web/pin.html
@@ -11,7 +11,7 @@
     <h1 class="my-4 text-center">{{ $t('pin.pin_pairing') }}</h1>
     <form action="" class="form d-flex flex-column align-items-center" id="form">
       <div class="card flex-column d-flex p-4 mb-4">
-        <input type="text" pattern="\d*" :placeholder="`${$t('navbar.pin')}`" id="pin-input" class="form-control mt-2" required />
+        <input type="text" pattern="\d*" :placeholder="`${$t('navbar.pin')}`" autofocus id="pin-input" class="form-control mt-2" required />
         <input type="text" :placeholder="`${$t('pin.device_name')}`" id="name-input" class="form-control my-4" required />
         <button class="btn btn-primary">{{ $t('pin.send') }}</button>
       </div>