diff --git a/browser-extensions/chrome/src/app/Index.tsx b/browser-extensions/chrome/src/app/Index.tsx
index de98515b..2e103ecb 100644
--- a/browser-extensions/chrome/src/app/Index.tsx
+++ b/browser-extensions/chrome/src/app/Index.tsx
@@ -7,13 +7,13 @@ import { LoadingProvider } from './context/LoadingContext';
 
 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
 root.render(
-  <AuthProvider>
-    <DbProvider>
+  <DbProvider>
+    <AuthProvider>
       <WebApiProvider>
         <LoadingProvider>
           <App />
         </LoadingProvider>
       </WebApiProvider>
-    </DbProvider>
-  </AuthProvider>
+    </AuthProvider>
+  </DbProvider>
 );
diff --git a/browser-extensions/chrome/src/app/context/AuthContext.tsx b/browser-extensions/chrome/src/app/context/AuthContext.tsx
index 02d76a63..7909206d 100644
--- a/browser-extensions/chrome/src/app/context/AuthContext.tsx
+++ b/browser-extensions/chrome/src/app/context/AuthContext.tsx
@@ -1,4 +1,5 @@
 import React, { createContext, useContext, useState, useEffect } from 'react';
+import { useDb } from './DbContext';
 
 type AuthContextType = {
   isLoggedIn: boolean;
@@ -23,6 +24,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
   const [isInitialized, setIsInitialized] = useState(false);
   const [username, setUsername] = useState<string | null>(null);
   const [globalMessage, setGlobalMessage] = useState<string | null>(null);
+  const dbContext = useDb();
 
   /**
    * Check for tokens in chrome storage on initial load.
@@ -63,6 +65,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
   const logout = async (errorMessage?: string) : Promise<void> => {
     await chrome.runtime.sendMessage({ type: 'CLEAR_VAULT' });
     await chrome.storage.local.remove(['username', 'accessToken', 'refreshToken']);
+    await dbContext?.clearDatabase();
 
     // Set local storage global message that will be shown on the login page.
     if (errorMessage) {
diff --git a/browser-extensions/chrome/src/contentScript/Popup.ts b/browser-extensions/chrome/src/contentScript/Popup.ts
index e362f4ee..30e65b21 100644
--- a/browser-extensions/chrome/src/contentScript/Popup.ts
+++ b/browser-extensions/chrome/src/contentScript/Popup.ts
@@ -685,6 +685,8 @@ function createCredentialList(credentials: Credential[]): HTMLElement[] {
     noMatches.style.cssText = `
         padding-left: 10px;
         padding-top: 8px;
+        padding-bottom: 8px;
+        font-size: 14px;
         color: ${isDarkMode() ? '#9ca3af' : '#6b7280'};
         font-style: italic;
         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !important;