diff --git a/browser-extensions/chrome/src/components/AppContent.tsx b/browser-extensions/chrome/src/components/AppContent.tsx
index a6f4eb9a5..b64a832ff 100644
--- a/browser-extensions/chrome/src/components/AppContent.tsx
+++ b/browser-extensions/chrome/src/components/AppContent.tsx
@@ -5,6 +5,7 @@ import { useDb } from '../context/DbContext';
 import Unlock from './Unlock';
 import Login from './Login';
 import Settings from './Settings';
+import CredentialsList from './CredentialsList';
 
 interface Credential {
   Id: string;
@@ -39,49 +40,20 @@ function base64Encode(buffer: any): string | null {
 const AppContent: React.FC = () => {
   const { isLoggedIn, username, logout } = useAuth();
   const dbContext = useDb();
-  const [credentials, setCredentials] = useState<Credential[]>([]);
   const [needsUnlock, setNeedsUnlock] = useState(false);
   const [showSettings, setShowSettings] = useState(false);
 
   useEffect(() => {
     if (isLoggedIn) {
-      console.log('isLoggedIn is true');
       if (!dbContext.isInitialized) {
-        console.log('Database is not initialized, setting needsUnlock to true');
         setNeedsUnlock(true);
       } else {
-        console.log('Database is initialized, setting needsUnlock to false');
         setNeedsUnlock(false);
-        loadCredentials();
       }
     }
   }, [isLoggedIn, dbContext.isInitialized]);
 
-  const loadCredentials = () => {
-    if (!dbContext?.sqliteClient) return;
-
-    try {
-      const results = dbContext.sqliteClient.executeQuery<Credential>(
-        `SELECT
-          c.Id,
-          c.Username as Username,
-          s.Name as ServiceName,
-          s.Logo as Logo
-        FROM Credentials c
-        JOIN Services s ON s.Id = c.ServiceId
-        WHERE c.IsDeleted = 0`
-      );
-      setCredentials(results);
-
-        console.log(results);
-    } catch (err) {
-      console.error('Error loading credentials:', err);
-    }
-  };
-
   const handleLogout = () => {
-    setCredentials([]);
-    setNeedsUnlock(true);
     logout();
   };
 
@@ -134,32 +106,7 @@ const AppContent: React.FC = () => {
               <Unlock />
             ) : (
               <div>
-                <div className="bg-white dark:bg-gray-700 rounded-lg p-4 mb-4 shadow-lg">
-                  <h2 className="text-gray-900 dark:text-white text-xl mb-4">Your Credentials</h2>
-                  {credentials.length === 0 ? (
-                    <p className="text-gray-500 dark:text-gray-400">No credentials found</p>
-                  ) : (
-                    <ul className="space-y-2">
-                      {credentials.map(cred => (
-                        <li key={cred.Id} className="p-2 border dark:border-gray-600 rounded flex items-center bg-gray-50 dark:bg-gray-800">
-                          <img
-                            src={cred.Logo ? `data:image/x-icon;base64,${base64Encode(cred.Logo)}` : '/images/service-placeholder.webp'}
-                            alt={cred.ServiceName}
-                            className="w-8 h-8 mr-2 flex-shrink-0"
-                            onError={(e) => {
-                              const target = e.target as HTMLImageElement;
-                              target.src = '/images/service-placeholder.webp';
-                            }}
-                          />
-                          <div>
-                            <p className="font-medium text-gray-900 dark:text-white">{cred.ServiceName}</p>
-                            <p className="text-sm text-gray-600 dark:text-gray-400">{cred.Username}</p>
-                          </div>
-                        </li>
-                      ))}
-                    </ul>
-                  )}
-                </div>
+                <CredentialsList base64Encode={base64Encode} />
                 <Button onClick={handleLogout}>Logout</Button>
               </div>
             )}
diff --git a/browser-extensions/chrome/src/components/CredentialsList.tsx b/browser-extensions/chrome/src/components/CredentialsList.tsx
new file mode 100644
index 000000000..b7ad038a9
--- /dev/null
+++ b/browser-extensions/chrome/src/components/CredentialsList.tsx
@@ -0,0 +1,73 @@
+import React, { useState, useEffect } from 'react';
+import { useDb } from '../context/DbContext';
+
+interface Credential {
+  Id: string;
+  ServiceName: string;
+  Username: string;
+  Logo?: any;
+}
+
+interface CredentialsListProps {
+  base64Encode: (buffer: any) => string | null;
+}
+
+const CredentialsList: React.FC<CredentialsListProps> = ({ base64Encode }) => {
+  const dbContext = useDb();
+  const [credentials, setCredentials] = useState<Credential[]>([]);
+
+  useEffect(() => {
+    loadCredentials();
+  }, [dbContext.sqliteClient]);
+
+  const loadCredentials = () => {
+    if (!dbContext?.sqliteClient) return;
+
+    try {
+      const results = dbContext.sqliteClient.executeQuery<Credential>(
+        `SELECT
+          c.Id,
+          c.Username as Username,
+          s.Name as ServiceName,
+          s.Logo as Logo
+        FROM Credentials c
+        JOIN Services s ON s.Id = c.ServiceId
+        WHERE c.IsDeleted = 0`
+      );
+      setCredentials(results);
+    } catch (err) {
+      console.error('Error loading credentials:', err);
+    }
+  };
+
+  return (
+    <div className="bg-white dark:bg-gray-700 rounded-lg p-4 mb-4 shadow-lg">
+      <h2 className="text-gray-900 dark:text-white text-xl mb-4">Your Credentials</h2>
+      {credentials.length === 0 ? (
+        <p className="text-gray-500 dark:text-gray-400">No credentials found</p>
+      ) : (
+        <ul className="space-y-2">
+          {credentials.map(cred => (
+            <li key={cred.Id} className="p-2 border dark:border-gray-600 rounded flex items-center bg-gray-50 dark:bg-gray-800">
+              <img
+                src={cred.Logo ? `data:image/x-icon;base64,${base64Encode(cred.Logo)}` : '/images/service-placeholder.webp'}
+                alt={cred.ServiceName}
+                className="w-8 h-8 mr-2 flex-shrink-0"
+                onError={(e) => {
+                  const target = e.target as HTMLImageElement;
+                  target.src = '/images/service-placeholder.webp';
+                }}
+              />
+              <div>
+                <p className="font-medium text-gray-900 dark:text-white">{cred.ServiceName}</p>
+                <p className="text-sm text-gray-600 dark:text-gray-400">{cred.Username}</p>
+              </div>
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  );
+};
+
+export default CredentialsList;
\ No newline at end of file