diff --git a/admin/src/components/UserQuery.vue b/admin/src/components/UserQuery.vue
index f6677fa1a..045ad1ff9 100644
--- a/admin/src/components/UserQuery.vue
+++ b/admin/src/components/UserQuery.vue
@@ -7,7 +7,7 @@
         v-model="currentValue"
         :placeholder="placeholderText"
       />
-      <div append class="test-click-clear-criteria" @click="clearValue">
+      <div append class="test-click-clear-criteria" @click="onClear">
         <BInputGroupText class="pointer h-100">
           <IIcBaselineClose />
         </BInputGroupText>
@@ -22,25 +22,32 @@ import { useI18n } from 'vue-i18n'
 import { BInputGroupText, BFormInput } from 'bootstrap-vue-next'
 
 const props = defineProps({
-  value: { type: String, default: '' },
+  modelValue: { type: String, default: '' },
   placeholder: { type: String, default: '' },
 })
 
-const emit = defineEmits(['input'])
+const emit = defineEmits(['update:modelValue'])
 
 const { t } = useI18n()
 
-const currentValue = ref(props.value)
-
 const placeholderText = computed(() => props.placeholder || t('user_search'))
 
-const clearValue = () => {
+const onClear = () => {
   currentValue.value = ''
 }
 
+const currentValue = ref(props.modelValue)
+
 watch(currentValue, (newValue) => {
-  if (props.value !== newValue) {
-    emit('input', newValue)
-  }
+  emit('update:modelValue', newValue)
 })
+
+watch(
+  () => props.modelValue,
+  (newValue) => {
+    if (newValue !== currentValue.value) {
+      currentValue.value = newValue
+    }
+  },
+)
 </script>
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 8aa84c086..a47fef58e 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -32,13 +32,13 @@
       @updateDeletedAt="updateDeletedAt"
     />
     <BPagination
-      pills
-      size="lg"
       v-model="currentPage"
       :per-page="perPage"
       :total-rows="rows"
       align="center"
       :hide-ellipsis="true"
+      pills
+      size="lg"
     />
   </div>
 </template>
@@ -65,7 +65,7 @@ const currentPage = ref(1)
 const perPage = ref(25)
 const response = ref()
 
-const { creationDates, creationLabel } = useCreationMonths()
+const { creationLabel } = useCreationMonths()
 
 const { result, refetch } = useQuery(searchUsers, {
   query: criteria.value,
@@ -91,7 +91,6 @@ const updateRoles = (userId, roles) => {
 const updateDeletedAt = (userId, deletedAt) => {
   searchResult.value.find((obj) => obj.userId === userId).deletedAt = deletedAt
   // toastSuccess(deletedAt ? $t('user_deleted') : $t('user_recovered'))
-  refetch()
 }
 
 const unconfirmedRegisterMails = () => {
@@ -122,8 +121,32 @@ const fields = computed(() => [
   { key: 'status', label: t('status') },
 ])
 
-watch(currentPage, refetch)
-watch(criteria, refetch)
+watch(
+  () => currentPage.value,
+  async (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      await refetch({
+        query: criteria.value,
+        filters: filters,
+        currentPage: newValue,
+        pageSize: perPage.value,
+        order: 'DESC',
+        fetchPolicy: 'no-cache',
+      })
+    }
+  },
+)
+
+watch(
+  () => criteria.value,
+  async (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      await refetch({
+        query: newValue,
+      })
+    }
+  },
+)
 </script>
 <style scoped>
 .user-search-first-div {