diff --git a/components/publisher/PublisherForm.js b/components/publisher/PublisherForm.js
index 5718d6c..130178e 100644
--- a/components/publisher/PublisherForm.js
+++ b/components/publisher/PublisherForm.js
@@ -15,7 +15,8 @@ import AvailabilityList from "../availability/AvailabilityList";
 import ShiftsList from "../publisher/ShiftsList.tsx";
 import ConfirmationModal from "../ConfirmationModal";
 import { UserRole } from "@prisma/client";
-import { getSession } from "next-auth/react";
+
+const { data: session } = useSession()
 
 // import { Tabs, List } from 'tw-elements'
 
diff --git a/pages/auth/signin.tsx b/pages/auth/signin.tsx
index 93107f7..446e08a 100644
--- a/pages/auth/signin.tsx
+++ b/pages/auth/signin.tsx
@@ -3,6 +3,7 @@ import { getCsrfToken, signIn } from 'next-auth/react';
 import React, { useState } from 'react';
 import { useRouter } from 'next/router';
 import Layout from '../../components/layout';
+const { data: session } = useSession()
 
 export default function SignIn({ csrfToken }) {
     const [email, setEmail] = useState('');
@@ -10,6 +11,16 @@ export default function SignIn({ csrfToken }) {
     const [error, setError] = useState('');
     const router = useRouter();
 
+    //handle callbackUrl
+    const { callbackUrl } = router.query;
+    if (callbackUrl) {
+        if (session) {
+            router.push(callbackUrl);
+        }
+    }
+
+
+
     const handleSubmit = async (e) => {
         e.preventDefault();