diff --git a/pages/login.vue b/pages/login.vue
index dc9e75b..83ba80c 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -169,6 +169,9 @@
 </template>
 
 <script setup lang="ts">
+const route = useRoute()
+const router = useRouter()
+
 const username = ref('')
 const password = ref('')
 const confirmPassword = ref('')
@@ -177,7 +180,9 @@ const firstName = ref('')
 const lastName = ref('')
 const error = ref('')
 const loading = ref(false)
-const isRegistering = ref(false)
+
+// Initialize from URL query parameter
+const isRegistering = ref(route.query.mode === 'register')
 
 const passwordRequirements = computed(() => ({
   minLength: password.value.length >= 8,
@@ -206,6 +211,15 @@ function toggleMode() {
   email.value = ''
   firstName.value = ''
   lastName.value = ''
+
+  // Update URL to reflect mode
+  const query = { ...route.query }
+  if (isRegistering.value) {
+    query.mode = 'register'
+  } else {
+    delete query.mode
+  }
+  router.replace({ query })
 }
 
 async function handleLogin() {
@@ -223,7 +237,6 @@ async function handleLogin() {
 
     if (response.success) {
       // Check if there's a redirect parameter
-      const route = useRoute()
       const redirect = route.query.redirect as string
       await navigateTo(redirect || '/')
     }
@@ -236,19 +249,19 @@ async function handleLogin() {
 
 async function handleRegister() {
   error.value = ''
-  
+
   // Validate password requirements
   if (!isPasswordValid.value) {
     error.value = 'Please meet all password requirements'
     return
   }
-  
+
   // Validate passwords match
   if (!passwordsMatch.value) {
     error.value = 'Passwords do not match'
     return
   }
-  
+
   loading.value = true
 
   try {
@@ -265,7 +278,6 @@ async function handleRegister() {
 
     if (response.success) {
       // Check if there's a redirect parameter
-      const route = useRoute()
       const redirect = route.query.redirect as string
       await navigateTo(redirect || '/')
     }