diff --git a/src/app/_components/Home.tsx b/src/app/_components/Home.tsx
index 711d1329..fc6b137a 100644
--- a/src/app/_components/Home.tsx
+++ b/src/app/_components/Home.tsx
@@ -138,7 +138,7 @@ export default function Home({ settings }: Props) {
       <div className='animate-fade-in animation-delay-700'>
         {!isLoggedIn && (
           <button
-            className='button button-sm button--plex mx-auto'
+            className='button button-sm button--plex mx-auto mb-4'
             onClick={() => handleLogin()}
           >
             Log in with Plex
@@ -166,7 +166,7 @@ export default function Home({ settings }: Props) {
               ))}
             </>
           ) : (
-            <Link href='/rewind' className='button'>
+            <Link href='/rewind' className='button mb-4'>
               Start Rewind
             </Link>
           ))}
@@ -181,8 +181,8 @@ export default function Home({ settings }: Props) {
                   : '',
             )}${settings.dashboard.defaultStyle === 'personal' && isLoggedIn ? '?personal=true' : ''}`}
             className={clsx(
-              'mx-auto mt-4 block',
-              !settings.rewind.isActive ? 'button' : 'link',
+              'mx-auto block',
+              !settings.rewind.isActive && isLoggedIn ? 'button' : 'link',
             )}
           >
             Dashboard
diff --git a/src/app/dashboard/users/page.tsx b/src/app/dashboard/users/page.tsx
index bf017f19..424f83e1 100644
--- a/src/app/dashboard/users/page.tsx
+++ b/src/app/dashboard/users/page.tsx
@@ -1,5 +1,10 @@
 import { authOptions } from '@/lib/auth'
-import { DashboardSearchParams, Settings, TautulliItem } from '@/types'
+import {
+  DashboardSearchParams,
+  Settings,
+  TautulliItem,
+  TautulliUser,
+} from '@/types'
 import {
   fetchOverseerrUserId,
   fetchPaginatedOverseerrStats,
@@ -157,9 +162,16 @@ async function getTotalDuration(period: string, settings: Settings) {
 
 async function getUsersCount(settings: Settings) {
   if (settings.dashboard.activeTotalStatistics.includes('count')) {
-    const usersCount = await fetchTautulli<[]>('get_users')
+    const usersRes = await fetchTautulli<TautulliUser[]>('get_users')
+    let users = usersRes?.response?.data
+
+    if (users) {
+      users = users.filter(
+        (user) => user.is_active && user.username !== 'Local',
+      )
+    }
 
-    return usersCount?.response?.data.slice(1).length
+    return users?.length
   }
 
   return undefined
diff --git a/src/app/rewind/page.tsx b/src/app/rewind/page.tsx
index f4e528f6..292f3730 100644
--- a/src/app/rewind/page.tsx
+++ b/src/app/rewind/page.tsx
@@ -40,7 +40,7 @@ export default async function RewindPage({ searchParams }: Props) {
     )
     const queriedUser = res?.response.data
 
-    if (queriedUser && queriedUser.user_id === queryUserId) {
+    if (queriedUser && queriedUser.user_id == queryUserId) {
       user = {
         image: queriedUser.user_thumb,
         name: queriedUser.friendly_name,
diff --git a/src/app/settings/rewind/_components/RewindSettingsForm.tsx b/src/app/settings/rewind/_components/RewindSettingsForm.tsx
index 4a2befd0..c55a65e7 100644
--- a/src/app/settings/rewind/_components/RewindSettingsForm.tsx
+++ b/src/app/settings/rewind/_components/RewindSettingsForm.tsx
@@ -1,15 +1,17 @@
 'use client'
 
-import { Settings } from '@/types'
+import { Settings, TautulliUser } from '@/types'
+import Link from 'next/link'
 import { Switch } from 'react-aria-components'
 import SettingsForm from '../../_components/SettingsForm'
 import saveRewindSettings from '../_actions/updateRewindSettings'
 
 type Props = {
   settings: Settings
+  users: TautulliUser[] | undefined
 }
 
-export default function RewindSettingsForm({ settings }: Props) {
+export default function RewindSettingsForm({ settings, users }: Props) {
   const rewindSettings = settings.rewind
 
   return (
@@ -42,6 +44,24 @@ export default function RewindSettingsForm({ settings }: Props) {
           </span>
         </Switch>
       </section>
+      {users?.length && rewindSettings.isActive && (
+        <section className='group-settings group'>
+          <h2 className='heading-settings'>Users Rewinds</h2>
+          <ul className='flex flex-wrap gap-2 sm:ml-48'>
+            {users.map((user) => (
+              <li key={user.user_id}>
+                <Link
+                  href={`/rewind?userId=${user.user_id}`}
+                  target='_blank'
+                  className='button button-sm'
+                >
+                  {user.friendly_name}
+                </Link>
+              </li>
+            ))}
+          </ul>
+        </section>
+      )}
     </SettingsForm>
   )
 }
diff --git a/src/app/settings/rewind/page.tsx b/src/app/settings/rewind/page.tsx
index fcc4cf76..b0ce3a94 100644
--- a/src/app/settings/rewind/page.tsx
+++ b/src/app/settings/rewind/page.tsx
@@ -1,3 +1,5 @@
+import { TautulliUser } from '@/types'
+import fetchTautulli from '@/utils/fetchTautulli'
 import getSettings from '@/utils/getSettings'
 import { Metadata } from 'next'
 import RewindSettingsForm from './_components/RewindSettingsForm'
@@ -8,6 +10,11 @@ export const metadata: Metadata = {
 
 export default async function RewindSettingsPage() {
   const settings = getSettings()
+  const usersRes = await fetchTautulli<TautulliUser[]>('get_users')
+  const users = usersRes?.response?.data
+  const fileredUsers = users?.filter(
+    (user) => user.is_active && user.username !== 'Local',
+  )
 
-  return <RewindSettingsForm settings={settings} />
+  return <RewindSettingsForm settings={settings} users={fileredUsers} />
 }
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index b7afb3bb..6a1d77cf 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,3 +1,4 @@
+import { TautulliUser } from '@/types'
 import { AuthOptions } from 'next-auth'
 import CredentialsProvider from 'next-auth/providers/credentials'
 import qs from 'qs'
@@ -67,17 +68,14 @@ export const authOptions: AuthOptions = {
           console.log('[AUTH] - User logged in with data:', userData)
 
           if (res.ok && userData) {
-            const checkUser = await fetchTautulli<{ email: string }>(
-              'get_user',
-              {
-                user_id: userData.id,
-              },
-            )
-
-            const userExists =
-              checkUser?.response?.data?.email === userData.email
-
-            if (userExists) {
+            const checkUserRes = await fetchTautulli<TautulliUser>('get_user', {
+              user_id: userData.id,
+            })
+            const checkUser = checkUserRes?.response?.data
+            const userValid =
+              checkUser?.email === userData.email && checkUser?.is_active
+
+            if (userValid) {
               return userData
             } else {
               console.error('[AUTH] - User does not belong to this server!')
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index f56df0d8..cc0aca73 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -101,6 +101,8 @@ export type TautulliUser = {
   friendly_name: string
   thumb: string
   user_thumb: string
+  username: string
+  email: string
 }
 
 export type SettingsFormInitialState = {