diff --git a/app/templates/admin/companies.html b/app/templates/admin/companies.html
index 8b441213..c35eda5d 100644
--- a/app/templates/admin/companies.html
+++ b/app/templates/admin/companies.html
@@ -98,6 +98,62 @@
     </div>
 </div>
 
+<!-- Search and Filters Bar -->
+<div x-show="!loading" class="mb-6 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
+    <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+        <!-- Search Input -->
+        <div class="flex-1 max-w-md">
+            <div class="relative">
+                <span class="absolute inset-y-0 left-0 flex items-center pl-3">
+                    <span x-html="$icon('search', 'w-5 h-5 text-gray-400')"></span>
+                </span>
+                <input
+                    type="text"
+                    x-model="filters.search"
+                    @input="debouncedSearch()"
+                    placeholder="Search by name or email..."
+                    class="w-full pl-10 pr-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none dark:bg-gray-700 dark:text-gray-300"
+                >
+            </div>
+        </div>
+
+        <!-- Filters -->
+        <div class="flex flex-wrap gap-3">
+            <!-- Status Filter -->
+            <select
+                x-model="filters.is_active"
+                @change="pagination.page = 1; loadCompanies()"
+                class="px-4 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none"
+            >
+                <option value="">All Status</option>
+                <option value="true">Active</option>
+                <option value="false">Inactive</option>
+            </select>
+
+            <!-- Verification Filter -->
+            <select
+                x-model="filters.is_verified"
+                @change="pagination.page = 1; loadCompanies()"
+                class="px-4 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none"
+            >
+                <option value="">All Verification</option>
+                <option value="true">Verified</option>
+                <option value="false">Unverified</option>
+            </select>
+
+            <!-- Refresh Button -->
+            <button
+                @click="loadCompanies()"
+                class="flex items-center px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none transition-colors"
+                title="Refresh companies"
+            >
+                <span x-html="$icon('refresh', 'w-4 h-4 mr-2')"></span>
+                Refresh
+            </button>
+        </div>
+    </div>
+</div>
+
 <!-- Companies Table -->
 <div x-show="!loading" class="w-full overflow-hidden rounded-lg shadow-xs">
     <div class="w-full overflow-x-auto">
@@ -120,7 +176,7 @@
                             <div class="flex flex-col items-center">
                                 <span x-html="$icon('office-building', 'w-12 h-12 mb-2 text-gray-300')"></span>
                                 <p class="font-medium">No companies found</p>
-                                <p class="text-xs mt-1">Create your first company to get started</p>
+                                <p class="text-xs mt-1" x-text="filters.search || filters.is_active || filters.is_verified ? 'Try adjusting your search or filters' : 'Create your first company to get started'"></p>
                             </div>
                         </td>
                     </tr>
@@ -218,7 +274,7 @@
     <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
         <!-- Results Info -->
         <span class="flex items-center col-span-3">
-            Showing <span class="mx-1 font-bold" x-text="startIndex"></span>-<span class="mx-1 font-bold" x-text="endIndex"></span> of <span class="mx-1 font-bold" x-text="companies.length"></span>
+            Showing <span class="mx-1 font-bold" x-text="startIndex"></span>-<span class="mx-1 font-bold" x-text="endIndex"></span> of <span class="mx-1 font-bold" x-text="pagination.total"></span>
         </span>
         <span class="col-span-2"></span>
 
@@ -230,9 +286,9 @@
                     <li>
                         <button
                             @click="previousPage()"
-                            :disabled="currentPage === 1"
+                            :disabled="pagination.page === 1"
                             class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
-                            :class="currentPage === 1 ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
+                            :class="pagination.page === 1 ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
                             aria-label="Previous"
                         >
                             <svg class="w-4 h-4 fill-current" aria-hidden="true" viewBox="0 0 20 20">
@@ -242,16 +298,16 @@
                     </li>
 
                     <!-- Page Numbers -->
-                    <template x-for="page in pageNumbers" :key="page">
+                    <template x-for="pageNum in pageNumbers" :key="pageNum">
                         <li>
                             <button
-                                x-show="page !== '...'"
-                                @click="goToPage(page)"
+                                x-show="pageNum !== '...'"
+                                @click="goToPage(pageNum)"
                                 class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                                :class="currentPage === page ? 'text-white bg-purple-600 border border-purple-600' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
-                                x-text="page"
+                                :class="pagination.page === pageNum ? 'text-white bg-purple-600 border border-purple-600' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
+                                x-text="pageNum"
                             ></button>
-                            <span x-show="page === '...'" class="px-3 py-1">...</span>
+                            <span x-show="pageNum === '...'" class="px-3 py-1">...</span>
                         </li>
                     </template>
 
@@ -259,9 +315,9 @@
                     <li>
                         <button
                             @click="nextPage()"
-                            :disabled="currentPage === totalPages"
+                            :disabled="pagination.page === totalPages"
                             class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
-                            :class="currentPage === totalPages ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
+                            :class="pagination.page === totalPages ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
                             aria-label="Next"
                         >
                             <svg class="w-4 h-4 fill-current" aria-hidden="true" viewBox="0 0 20 20">
diff --git a/app/templates/admin/vendors.html b/app/templates/admin/vendors.html
index 3744ef13..693ec106 100644
--- a/app/templates/admin/vendors.html
+++ b/app/templates/admin/vendors.html
@@ -98,6 +98,62 @@
     </div>
 </div>
 
+<!-- Search and Filters Bar -->
+<div x-show="!loading" class="mb-6 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
+    <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+        <!-- Search Input -->
+        <div class="flex-1 max-w-md">
+            <div class="relative">
+                <span class="absolute inset-y-0 left-0 flex items-center pl-3">
+                    <span x-html="$icon('search', 'w-5 h-5 text-gray-400')"></span>
+                </span>
+                <input
+                    type="text"
+                    x-model="filters.search"
+                    @input="debouncedSearch()"
+                    placeholder="Search by name or vendor code..."
+                    class="w-full pl-10 pr-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none dark:bg-gray-700 dark:text-gray-300"
+                >
+            </div>
+        </div>
+
+        <!-- Filters -->
+        <div class="flex flex-wrap gap-3">
+            <!-- Status Filter -->
+            <select
+                x-model="filters.is_active"
+                @change="pagination.page = 1; loadVendors()"
+                class="px-4 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none"
+            >
+                <option value="">All Status</option>
+                <option value="true">Active</option>
+                <option value="false">Inactive</option>
+            </select>
+
+            <!-- Verification Filter -->
+            <select
+                x-model="filters.is_verified"
+                @change="pagination.page = 1; loadVendors()"
+                class="px-4 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none"
+            >
+                <option value="">All Verification</option>
+                <option value="true">Verified</option>
+                <option value="false">Pending</option>
+            </select>
+
+            <!-- Refresh Button -->
+            <button
+                @click="refresh()"
+                class="flex items-center px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none transition-colors"
+                title="Refresh vendors"
+            >
+                <span x-html="$icon('refresh', 'w-4 h-4 mr-2')"></span>
+                Refresh
+            </button>
+        </div>
+    </div>
+</div>
+
 <!-- Vendors Table with Pagination -->
 <div x-show="!loading" class="w-full overflow-hidden rounded-lg shadow-xs">
     <div class="w-full overflow-x-auto">
@@ -119,7 +175,7 @@
                             <div class="flex flex-col items-center">
                                 <span x-html="$icon('user-group', 'w-12 h-12 mb-2 text-gray-300')"></span>
                                 <p class="font-medium">No vendors found</p>
-                                <p class="text-xs mt-1">Create your first vendor to get started</p>
+                                <p class="text-xs mt-1" x-text="filters.search || filters.is_active || filters.is_verified ? 'Try adjusting your search or filters' : 'Create your first vendor to get started'"></p>
                             </div>
                         </td>
                     </tr>
@@ -200,7 +256,7 @@
     <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
         <!-- Results Info -->
         <span class="flex items-center col-span-3">
-            Showing <span class="mx-1 font-bold" x-text="startIndex"></span>-<span class="mx-1 font-bold" x-text="endIndex"></span> of <span class="mx-1 font-bold" x-text="vendors.length"></span>
+            Showing <span class="mx-1 font-bold" x-text="startIndex"></span>-<span class="mx-1 font-bold" x-text="endIndex"></span> of <span class="mx-1 font-bold" x-text="pagination.total"></span>
         </span>
         <span class="col-span-2"></span>
 
@@ -212,9 +268,9 @@
                     <li>
                         <button
                             @click="previousPage()"
-                            :disabled="currentPage === 1"
+                            :disabled="pagination.page === 1"
                             class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
-                            :class="currentPage === 1 ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
+                            :class="pagination.page === 1 ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
                             aria-label="Previous"
                         >
                             <svg class="w-4 h-4 fill-current" aria-hidden="true" viewBox="0 0 20 20">
@@ -224,16 +280,16 @@
                     </li>
 
                     <!-- Page Numbers -->
-                    <template x-for="page in pageNumbers" :key="page">
+                    <template x-for="pageNum in pageNumbers" :key="pageNum">
                         <li>
                             <button
-                                x-show="page !== '...'"
-                                @click="goToPage(page)"
+                                x-show="pageNum !== '...'"
+                                @click="goToPage(pageNum)"
                                 class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                                :class="currentPage === page ? 'text-white bg-purple-600 border border-purple-600' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
-                                x-text="page"
+                                :class="pagination.page === pageNum ? 'text-white bg-purple-600 border border-purple-600' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
+                                x-text="pageNum"
                             ></button>
-                            <span x-show="page === '...'" class="px-3 py-1">...</span>
+                            <span x-show="pageNum === '...'" class="px-3 py-1">...</span>
                         </li>
                     </template>
 
@@ -241,9 +297,9 @@
                     <li>
                         <button
                             @click="nextPage()"
-                            :disabled="currentPage === totalPages"
+                            :disabled="pagination.page === totalPages"
                             class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
-                            :class="currentPage === totalPages ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
+                            :class="pagination.page === totalPages ? 'opacity-50 cursor-not-allowed' : 'hover:bg-gray-100 dark:hover:bg-gray-700'"
                             aria-label="Next"
                         >
                             <svg class="w-4 h-4 fill-current" aria-hidden="true" viewBox="0 0 20 20">
diff --git a/static/admin/js/companies.js b/static/admin/js/companies.js
index e2b7523f..a1cae0b7 100644
--- a/static/admin/js/companies.js
+++ b/static/admin/js/companies.js
@@ -11,7 +11,7 @@ function adminCompanies() {
         // Inherit base layout functionality
         ...data(),
 
-        // ✅ Page identifier for sidebar active state
+        // Page identifier for sidebar active state
         currentPage: 'companies',
 
         // Companies page specific state
@@ -25,9 +25,20 @@ function adminCompanies() {
         loading: false,
         error: null,
 
+        // Search and filters
+        filters: {
+            search: '',
+            is_active: '',
+            is_verified: ''
+        },
+
         // Pagination state
-        page: 1,
-        itemsPerPage: 10,
+        pagination: {
+            page: 1,
+            per_page: 10,
+            total: 0,
+            pages: 0
+        },
 
         // Initialize
         async init() {
@@ -42,53 +53,65 @@ function adminCompanies() {
 
             companiesLog.group('Loading companies data');
             await this.loadCompanies();
-            await this.loadStats();
             companiesLog.groupEnd();
 
             companiesLog.info('=== COMPANIES PAGE INITIALIZATION COMPLETE ===');
         },
 
-        // Computed: Get paginated companies for current page
+        // Debounced search
+        debouncedSearch() {
+            if (this._searchTimeout) {
+                clearTimeout(this._searchTimeout);
+            }
+            this._searchTimeout = setTimeout(() => {
+                companiesLog.info('Search triggered:', this.filters.search);
+                this.pagination.page = 1;
+                this.loadCompanies();
+            }, 300);
+        },
+
+        // Computed: Get companies for current page (already paginated from server)
         get paginatedCompanies() {
-            const start = (this.page - 1) * this.itemsPerPage;
-            const end = start + this.itemsPerPage;
-            return this.companies.slice(start, end);
+            return this.companies;
         },
 
         // Computed: Total number of pages
         get totalPages() {
-            return Math.ceil(this.companies.length / this.itemsPerPage);
+            return this.pagination.pages;
         },
 
         // Computed: Start index for pagination display
         get startIndex() {
-            if (this.companies.length === 0) return 0;
-            return (this.page - 1) * this.itemsPerPage + 1;
+            if (this.pagination.total === 0) return 0;
+            return (this.pagination.page - 1) * this.pagination.per_page + 1;
         },
 
         // Computed: End index for pagination display
         get endIndex() {
-            const end = this.page * this.itemsPerPage;
-            return end > this.companies.length ? this.companies.length : end;
+            const end = this.pagination.page * this.pagination.per_page;
+            return end > this.pagination.total ? this.pagination.total : end;
         },
 
         // Computed: Generate page numbers array with ellipsis
         get pageNumbers() {
             const pages = [];
             const totalPages = this.totalPages;
-            const current = this.page;
+            const current = this.pagination.page;
 
             if (totalPages <= 7) {
+                // Show all pages if 7 or fewer
                 for (let i = 1; i <= totalPages; i++) {
                     pages.push(i);
                 }
             } else {
+                // Always show first page
                 pages.push(1);
 
                 if (current > 3) {
                     pages.push('...');
                 }
 
+                // Show pages around current page
                 const start = Math.max(2, current - 1);
                 const end = Math.min(totalPages - 1, current + 1);
 
@@ -100,24 +123,49 @@ function adminCompanies() {
                     pages.push('...');
                 }
 
+                // Always show last page
                 pages.push(totalPages);
             }
 
             return pages;
         },
 
-        // Load all companies
+        // Load companies with search and pagination
         async loadCompanies() {
             this.loading = true;
             this.error = null;
 
             try {
                 companiesLog.info('Fetching companies from API...');
-                const response = await apiClient.get('/admin/companies');
+
+                const params = new URLSearchParams();
+                params.append('skip', (this.pagination.page - 1) * this.pagination.per_page);
+                params.append('limit', this.pagination.per_page);
+
+                if (this.filters.search) {
+                    params.append('search', this.filters.search);
+                }
+                if (this.filters.is_active) {
+                    params.append('is_active', this.filters.is_active);
+                }
+                if (this.filters.is_verified) {
+                    params.append('is_verified', this.filters.is_verified);
+                }
+
+                const response = await apiClient.get(`/admin/companies?${params}`);
 
                 if (response.companies) {
                     this.companies = response.companies;
-                    companiesLog.info(`Loaded ${this.companies.length} companies`);
+                    this.pagination.total = response.total;
+                    this.pagination.pages = Math.ceil(response.total / this.pagination.per_page);
+
+                    // Calculate stats from all companies (need separate call for accurate stats)
+                    this.stats.total = response.total;
+                    this.stats.verified = this.companies.filter(c => c.is_verified).length;
+                    this.stats.active = this.companies.filter(c => c.is_active).length;
+                    this.stats.totalVendors = this.companies.reduce((sum, c) => sum + (c.vendor_count || 0), 0);
+
+                    companiesLog.info(`Loaded ${this.companies.length} companies (total: ${response.total})`);
                 } else {
                     companiesLog.warn('No companies in response');
                     this.companies = [];
@@ -131,22 +179,6 @@ function adminCompanies() {
             }
         },
 
-        // Load statistics
-        async loadStats() {
-            try {
-                companiesLog.info('Calculating stats from companies...');
-
-                this.stats.total = this.companies.length;
-                this.stats.verified = this.companies.filter(c => c.is_verified).length;
-                this.stats.active = this.companies.filter(c => c.is_active).length;
-                this.stats.totalVendors = this.companies.reduce((sum, c) => sum + (c.vendor_count || 0), 0);
-
-                companiesLog.info('Stats calculated:', this.stats);
-            } catch (error) {
-                companiesLog.error('Failed to calculate stats:', error);
-            }
-        },
-
         // Edit company
         editCompany(companyId) {
             companiesLog.info('Edit company:', companyId);
@@ -191,23 +223,26 @@ function adminCompanies() {
 
         // Pagination methods
         previousPage() {
-            if (this.page > 1) {
-                this.page--;
-                companiesLog.info('Previous page:', this.page);
+            if (this.pagination.page > 1) {
+                this.pagination.page--;
+                companiesLog.info('Previous page:', this.pagination.page);
+                this.loadCompanies();
             }
         },
 
         nextPage() {
-            if (this.page < this.totalPages) {
-                this.page++;
-                companiesLog.info('Next page:', this.page);
+            if (this.pagination.page < this.totalPages) {
+                this.pagination.page++;
+                companiesLog.info('Next page:', this.pagination.page);
+                this.loadCompanies();
             }
         },
 
         goToPage(pageNum) {
             if (pageNum !== '...' && pageNum >= 1 && pageNum <= this.totalPages) {
-                this.page = pageNum;
-                companiesLog.info('Go to page:', this.page);
+                this.pagination.page = pageNum;
+                companiesLog.info('Go to page:', this.pagination.page);
+                this.loadCompanies();
             }
         },
 
diff --git a/static/admin/js/vendors.js b/static/admin/js/vendors.js
index 22877613..5f01343f 100644
--- a/static/admin/js/vendors.js
+++ b/static/admin/js/vendors.js
@@ -25,9 +25,20 @@ function adminVendors() {
         loading: false,
         error: null,
 
-        // Pagination state (renamed from currentPage to avoid conflict)
-        page: 1,  // ✅ FIXED: Was 'currentPage' which conflicted with sidebar
-        itemsPerPage: 10,
+        // Search and filters
+        filters: {
+            search: '',
+            is_active: '',
+            is_verified: ''
+        },
+
+        // Pagination state (server-side)
+        pagination: {
+            page: 1,
+            per_page: 10,
+            total: 0,
+            pages: 0
+        },
 
         // Initialize
         async init() {
@@ -48,35 +59,45 @@ function adminVendors() {
             vendorsLog.info('=== VENDORS PAGE INITIALIZATION COMPLETE ===');
         },
 
-        // Computed: Get paginated vendors for current page
+        // Debounced search
+        debouncedSearch() {
+            if (this._searchTimeout) {
+                clearTimeout(this._searchTimeout);
+            }
+            this._searchTimeout = setTimeout(() => {
+                vendorsLog.info('Search triggered:', this.filters.search);
+                this.pagination.page = 1;
+                this.loadVendors();
+            }, 300);
+        },
+
+        // Computed: Get vendors for current page (already paginated from server)
         get paginatedVendors() {
-            const start = (this.page - 1) * this.itemsPerPage;
-            const end = start + this.itemsPerPage;
-            return this.vendors.slice(start, end);
+            return this.vendors;
         },
 
         // Computed: Total number of pages
         get totalPages() {
-            return Math.ceil(this.vendors.length / this.itemsPerPage);
+            return this.pagination.pages;
         },
 
         // Computed: Start index for pagination display
         get startIndex() {
-            if (this.vendors.length === 0) return 0;
-            return (this.page - 1) * this.itemsPerPage + 1;
+            if (this.pagination.total === 0) return 0;
+            return (this.pagination.page - 1) * this.pagination.per_page + 1;
         },
 
         // Computed: End index for pagination display
         get endIndex() {
-            const end = this.page * this.itemsPerPage;
-            return end > this.vendors.length ? this.vendors.length : end;
+            const end = this.pagination.page * this.pagination.per_page;
+            return end > this.pagination.total ? this.pagination.total : end;
         },
 
         // Computed: Generate page numbers array with ellipsis
         get pageNumbers() {
             const pages = [];
             const totalPages = this.totalPages;
-            const current = this.page;
+            const current = this.pagination.page;
 
             if (totalPages <= 7) {
                 // Show all pages if 7 or fewer
@@ -110,14 +131,29 @@ function adminVendors() {
             return pages;
         },
 
-        // Load vendors list
+        // Load vendors list with search and pagination
         async loadVendors() {
             vendorsLog.info('Loading vendors list...');
             this.loading = true;
             this.error = null;
 
             try {
-                const url = '/admin/vendors';
+                // Build query parameters
+                const params = new URLSearchParams();
+                params.append('skip', (this.pagination.page - 1) * this.pagination.per_page);
+                params.append('limit', this.pagination.per_page);
+
+                if (this.filters.search) {
+                    params.append('search', this.filters.search);
+                }
+                if (this.filters.is_active !== '') {
+                    params.append('is_active', this.filters.is_active);
+                }
+                if (this.filters.is_verified !== '') {
+                    params.append('is_verified', this.filters.is_verified);
+                }
+
+                const url = `/admin/vendors?${params}`;
                 window.LogConfig.logApiCall('GET', url, null, 'request');
 
                 const startTime = performance.now();
@@ -127,21 +163,29 @@ function adminVendors() {
                 window.LogConfig.logApiCall('GET', url, response, 'response');
                 window.LogConfig.logPerformance('Load Vendors', duration);
 
-                // Handle different response structures
-                this.vendors = response.vendors || response.items || response || [];
+                // Handle response with pagination info
+                if (response.vendors) {
+                    this.vendors = response.vendors;
+                    this.pagination.total = response.total;
+                    this.pagination.pages = Math.ceil(response.total / this.pagination.per_page);
 
-                vendorsLog.info(`Vendors loaded in ${duration}ms`, {
-                    count: this.vendors.length,
-                    hasVendors: this.vendors.length > 0
-                });
+                    vendorsLog.info(`Loaded ${this.vendors.length} vendors (total: ${response.total})`);
+                } else {
+                    // Fallback for different response structures
+                    this.vendors = response.items || response || [];
+                    this.pagination.total = this.vendors.length;
+                    this.pagination.pages = Math.ceil(this.vendors.length / this.pagination.per_page);
+
+                    vendorsLog.info(`Vendors loaded in ${duration}ms`, {
+                        count: this.vendors.length,
+                        hasVendors: this.vendors.length > 0
+                    });
+                }
 
                 if (this.vendors.length > 0) {
                     vendorsLog.debug('First vendor:', this.vendors[0]);
                 }
 
-                // Reset to first page when data is loaded
-                this.page = 1;
-
             } catch (error) {
                 window.LogConfig.logError(error, 'Load Vendors');
                 this.error = error.message || 'Failed to load vendors';
@@ -181,22 +225,25 @@ function adminVendors() {
                 return;
             }
             vendorsLog.info('Going to page:', pageNum);
-            this.page = pageNum;
+            this.pagination.page = pageNum;
+            this.loadVendors();
         },
 
         // Pagination: Go to next page
         nextPage() {
-            if (this.page < this.totalPages) {
+            if (this.pagination.page < this.totalPages) {
                 vendorsLog.info('Going to next page');
-                this.page++;
+                this.pagination.page++;
+                this.loadVendors();
             }
         },
 
         // Pagination: Go to previous page
         previousPage() {
-            if (this.page > 1) {
+            if (this.pagination.page > 1) {
                 vendorsLog.info('Going to previous page');
-                this.page--;
+                this.pagination.page--;
+                this.loadVendors();
             }
         },