diff --git a/contexts/user.context.tsx b/contexts/user.context.tsx
index c42be1110..55037af14 100644
--- a/contexts/user.context.tsx
+++ b/contexts/user.context.tsx
@@ -131,7 +131,7 @@ export const UserProvider = ({ children }: { children: ReactElement }) => {
     <UserContext.Provider
       value={{
         user: error ? undefined : data,
-        isUserLoading: !(!!data || !!error),
+        isUserLoading: Boolean(data === undefined && error === undefined),
         mutateUser: mutate,
         activeWorkspace: workspaceError ? undefined : activeWorkspace,
         mutateWorkspaces: mutateWorkspaces,
diff --git a/package.json b/package.json
index 530811f0f..31de54cd4 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "trello-clone",
+  "name": "plane",
   "version": "0.1.0",
   "private": true,
   "scripts": {
diff --git a/pages/index.tsx b/pages/index.tsx
index b97fbcf67..5cb277ea7 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -10,7 +10,9 @@ const Home: NextPage = () => {
 
   const { user, isUserLoading, activeWorkspace, workspaces } = useUser();
 
-  if (!isUserLoading && !user) router.push("/signin");
+  useEffect(() => {
+    if (!isUserLoading && (!user || user === null)) router.push("/signin");
+  }, [isUserLoading, user, router]);
 
   useEffect(() => {
     if (!activeWorkspace && workspaces?.length === 0) router.push("/invitations");