diff --git a/src/entrypoints/popup/Popup.tsx b/src/entrypoints/popup/Popup.tsx
index a08fd61..a76c31c 100644
--- a/src/entrypoints/popup/Popup.tsx
+++ b/src/entrypoints/popup/Popup.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from 'react'
+import { AutologinToggle } from '@/features/autologin/AutologinToggle'
 import { SearchField } from '@/features/search/SearchField'
 import { SearchAutoSyncToggle } from '@/features/search-sync/SearchAutoSyncToggle'
 import { UsefulLinksSection } from '@/features/useful-links/UsefulLinksSection'
@@ -17,6 +18,7 @@ export default function Popup() {
       <UsefulLinksSection />
       <SearchField />
       <CoursesList />
+      <AutologinToggle />
       <SearchAutoSyncToggle />
     </div>
   )
diff --git a/src/features/autologin/AutologinToggle.tsx b/src/features/autologin/AutologinToggle.tsx
new file mode 100644
index 0000000..8d2b564
--- /dev/null
+++ b/src/features/autologin/AutologinToggle.tsx
@@ -0,0 +1,26 @@
+import { setStored, useStorage } from '@/shared/storage'
+import { cn } from '@/shared/ui/utils'
+
+export function AutologinToggle() {
+  const autologinEnabled = useStorage('autologinEnabled')
+
+  return (
+    <div className="w-full flex flex-row items-center justify-between gap-2 p-2">
+      <div className="flex items-center text-xs">
+        Enable autologin on Moodle (without entering your password)
+      </div>
+      <button
+        type="button"
+        className={cn(
+          'flex h-fit items-center justify-center rounded-lg px-2 py-1 text-xs font-normal text-base-content',
+          autologinEnabled === false ? 'bg-red-900' : 'bg-[#9747FF] hover:bg-[#6600CC]',
+        )}
+        onClick={() => {
+          setStored('autologinEnabled', !autologinEnabled)
+        }}
+      >
+        {autologinEnabled === false ? 'OFF' : 'ON'}
+      </button>
+    </div>
+  )
+}
diff --git a/src/features/autologin/background.ts b/src/features/autologin/background.ts
index 4ad6757..cc2fa9f 100644
--- a/src/features/autologin/background.ts
+++ b/src/features/autologin/background.ts
@@ -3,6 +3,12 @@ import { moodle } from '@/shared/moodle-ws-api'
 import { getStored, setStored } from '@/shared/storage'
 
 export async function autoLogIn() {
+  const enabled = await getStored('autologinEnabled')
+  if (!enabled) {
+    console.log('Auto login is disabled, skipping')
+    return false
+  }
+
   console.debug('Auto logging in...')
   const privateToken = await getStored('privateToken')
   if (!privateToken) {
diff --git a/src/features/search-sync/SearchAutoSyncToggle.tsx b/src/features/search-sync/SearchAutoSyncToggle.tsx
index e15d0ef..fd6944a 100644
--- a/src/features/search-sync/SearchAutoSyncToggle.tsx
+++ b/src/features/search-sync/SearchAutoSyncToggle.tsx
@@ -5,8 +5,8 @@ export function SearchAutoSyncToggle() {
   const allowSendingCourses = useStorage('allowSyncingCourses')
 
   return (
-    <div className="flex flex-row gap-2 p-2">
-      <div className="text-xs">
+    <div className="w-full flex flex-row items-center justify-between gap-2 p-2">
+      <div className="flex items-center text-xs">
         Sync your Moodle courses contents with InNoHassle Search for indexing and using AI search engine
       </div>
       <button
diff --git a/src/shared/storage/types.d.ts b/src/shared/storage/types.d.ts
index 9f94d0b..f132ac6 100644
--- a/src/shared/storage/types.d.ts
+++ b/src/shared/storage/types.d.ts
@@ -9,6 +9,7 @@ export interface SharedStorage {
   privateToken: string
 
   // Autologin
+  autologinEnabled: boolean
   autologinLastSuccessMS: number
 
   // User info