diff --git a/src/GZCTF/ClientApp/src/pages/admin/Logs.tsx b/src/GZCTF/ClientApp/src/pages/admin/Logs.tsx
index a3c778939..4bb4ea7ae 100644
--- a/src/GZCTF/ClientApp/src/pages/admin/Logs.tsx
+++ b/src/GZCTF/ClientApp/src/pages/admin/Logs.tsx
@@ -184,6 +184,9 @@ const Logs: FC = () => {
             >
               <Icon path={mdiArrowLeftBold} size={1} />
             </ActionIcon>
+            <Text fw="bold" size="sm">
+              {activePage}
+            </Text>
             <ActionIcon
               size="lg"
               disabled={logs && logs.length < ITEM_COUNT_PER_PAGE}
diff --git a/src/GZCTF/ClientApp/src/pages/admin/Teams.tsx b/src/GZCTF/ClientApp/src/pages/admin/Teams.tsx
index b56a1be05..88924fb19 100644
--- a/src/GZCTF/ClientApp/src/pages/admin/Teams.tsx
+++ b/src/GZCTF/ClientApp/src/pages/admin/Teams.tsx
@@ -89,7 +89,7 @@ const Teams: FC = () => {
       })
       .then((res) => {
         setTeams(res.data)
-        setCurrent((page - 1) * ITEM_COUNT_PER_PAGE + res.data.length)
+        setCurrent(res.data.length)
       })
       .catch(showErrorNotification)
       .finally(() => {
@@ -169,9 +169,12 @@ const Teams: FC = () => {
             <ActionIcon size="lg" disabled={page <= 1} onClick={() => setPage(page - 1)}>
               <Icon path={mdiArrowLeftBold} size={1} />
             </ActionIcon>
+            <Text fw="bold" size="sm">
+              {page}
+            </Text>
             <ActionIcon
               size="lg"
-              disabled={teams && teams.length < ITEM_COUNT_PER_PAGE}
+              disabled={page * ITEM_COUNT_PER_PAGE >= total}
               onClick={() => setPage(page + 1)}
             >
               <Icon path={mdiArrowRightBold} size={1} />
diff --git a/src/GZCTF/ClientApp/src/pages/admin/Users.tsx b/src/GZCTF/ClientApp/src/pages/admin/Users.tsx
index 4f6d7418a..4e37dcf10 100644
--- a/src/GZCTF/ClientApp/src/pages/admin/Users.tsx
+++ b/src/GZCTF/ClientApp/src/pages/admin/Users.tsx
@@ -93,7 +93,7 @@ const Users: FC = () => {
       })
       .then((res) => {
         setUsers(res.data)
-        setCurrent((page - 1) * ITEM_COUNT_PER_PAGE + res.data.length)
+        setCurrent(res.data.length)
       })
       .catch(showErrorNotification)
       .finally(() => {
@@ -211,9 +211,12 @@ const Users: FC = () => {
             <ActionIcon size="lg" disabled={page <= 1} onClick={() => setPage(page - 1)}>
               <Icon path={mdiArrowLeftBold} size={1} />
             </ActionIcon>
+            <Text fw="bold" size="sm">
+              {page}
+            </Text>
             <ActionIcon
               size="lg"
-              disabled={users && users.length < ITEM_COUNT_PER_PAGE}
+              disabled={page * ITEM_COUNT_PER_PAGE >= total}
               onClick={() => setPage(page + 1)}
             >
               <Icon path={mdiArrowRightBold} size={1} />
diff --git a/src/GZCTF/ClientApp/src/pages/admin/games/Index.tsx b/src/GZCTF/ClientApp/src/pages/admin/games/Index.tsx
index 503c0937b..82f42b801 100644
--- a/src/GZCTF/ClientApp/src/pages/admin/games/Index.tsx
+++ b/src/GZCTF/ClientApp/src/pages/admin/games/Index.tsx
@@ -94,9 +94,12 @@ const Games: FC = () => {
             <ActionIcon size="lg" disabled={page <= 1} onClick={() => setPage(page - 1)}>
               <Icon path={mdiArrowLeftBold} size={1} />
             </ActionIcon>
+            <Text fw="bold" size="sm">
+              {page}
+            </Text>
             <ActionIcon
               size="lg"
-              disabled={games && games.length < ITEM_COUNT_PER_PAGE}
+              disabled={page * ITEM_COUNT_PER_PAGE >= total}
               onClick={() => setPage(page + 1)}
             >
               <Icon path={mdiArrowRightBold} size={1} />