diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 632688b..4f1e1a0 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,6 +1,6 @@
-import { useAuth } from "../hooks/useAuth";
+import { useAuth } from "../hooks";
 import { LoadingWithSpinner } from "./LoadingWithSpinner";
-import { ButtonAnimationDecorator } from "./decorators/ButtonAnimationDecorator";
+import { ButtonAnimationDecorator } from "./decorators";
 import { useState } from "react";
 import { Link } from "react-router-dom";
 import { Navbar, Button } from "react-bootstrap";
@@ -46,10 +46,10 @@ export const Header = (): JSX.Element => {
           </h1>
         </Link>
       </Navbar.Brand>
-      {user && (
+      {user._id !== "" && (
         <ButtonAnimationDecorator>
           <Button
-            variant="dark"
+            variant="secondary"
             onClick={handleSignOutClick}
             disabled={isSigningOut}
             className="w-100"
diff --git a/src/components/ProtectedRoute.tsx b/src/components/ProtectedRoute.tsx
index 9d478a8..37990b7 100644
--- a/src/components/ProtectedRoute.tsx
+++ b/src/components/ProtectedRoute.tsx
@@ -6,12 +6,12 @@ export const ProtectedRoute = ({ children }: { children: React.ReactNode }) => {
   const { user, authenticate } = useAuth();
 
   useEffect(() => {
-    if (!user) {
+    if (user._id === "") {
       authenticate();
     }
   }, [user, authenticate]);
 
-  if (!user) {
+  if (user._id === "") {
     return <Navigate to="/login" />;;
   }
 
diff --git a/src/components/PublicRoute.tsx b/src/components/PublicRoute.tsx
index 35da8a3..40edd9b 100644
--- a/src/components/PublicRoute.tsx
+++ b/src/components/PublicRoute.tsx
@@ -1,17 +1,13 @@
+import { useAuth } from "../hooks";
 import { Navigate } from "react-router-dom";
-import { useAuth } from "../hooks/useAuth";
-import PropTypes from "prop-types";
 
-export const PublicRoute = ({ children }) => {
+export const PublicRoute = ({ children }: { children: React.ReactNode }) => {
   const { user } = useAuth();
 
-  if (user) {
+  if (user._id !== "") {
     return <Navigate to={`/${user._id}`}/>;
   }
 
   return children;
 };
 
-PublicRoute.propTypes = {
-  children: PropTypes.element,
-};
diff --git a/src/hooks/useAuth.tsx b/src/hooks/useAuth.tsx
index 539ecd7..edd75c9 100644
--- a/src/hooks/useAuth.tsx
+++ b/src/hooks/useAuth.tsx
@@ -7,7 +7,7 @@ const AuthContext = createContext({
   user: DEFAULT_USER,
   register: async (userData: UserRequest): Promise<UserResponse> =>
     DEFAULT_USER_RESPONSE,
-  authenticate: async (userData: UserRequest): Promise<UserResponse> =>
+  authenticate: async (): Promise<UserResponse> =>
     DEFAULT_USER_RESPONSE,
   signIn: async (userData: UserRequest): Promise<UserResponse> =>
     DEFAULT_USER_RESPONSE,