diff --git a/src/api.tsx b/src/api.tsx
index 161e745..ae84ac2 100644
--- a/src/api.tsx
+++ b/src/api.tsx
@@ -21,7 +21,11 @@ api.interceptors.response.use(
     (error) => {
         if (error.response && error.response.status === 401) {
             localStorage.removeItem('token');
-            window.location.href = '/login';
+            if(error.response.request.responseURL.indexOf('user/login') === -1) {
+              window.location.href = '/login';
+            } else {
+              return Promise.reject(error);
+            }
         }
         return Promise.reject(error);
     }
diff --git a/src/assets/logo.png b/src/assets/logo.png
new file mode 100644
index 0000000..640cd0a
Binary files /dev/null and b/src/assets/logo.png differ
diff --git a/src/routes/LoginPage.tsx b/src/routes/LoginPage.tsx
index 7b0e754..f784190 100644
--- a/src/routes/LoginPage.tsx
+++ b/src/routes/LoginPage.tsx
@@ -9,7 +9,7 @@ import {useNavigate} from "react-router-dom";
 export function LoginPage() {
   const [login,setLogin] = useState('');
   const [password, setPassword] = useState('');
-  const [showWrongUserNameAndPasswordError, setShowWrongUserNameAndPasswordError] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
   const [registerResultMessage, setRegisterResultMessage] = useState('');
   const auth = useAuth();
   const navigate = useNavigate();
@@ -21,11 +21,14 @@ export function LoginPage() {
       password: password,
     }).then((response) => {
       auth.login(response.data.token);
-      setShowWrongUserNameAndPasswordError(false);
+      setErrorMessage('');
       navigate('/');
     }).catch((err) => {
+      console.log(err);
       if(err.status === 401) {
-        setShowWrongUserNameAndPasswordError(true);
+        setErrorMessage('Wrong username or password');
+      } else {
+        setErrorMessage('Something went wrong');
       }
     })
   }
@@ -37,10 +40,10 @@ export function LoginPage() {
     }).then((response) => {
       if(response.status === 201) {
         setRegisterResultMessage('User registered successfully. You can now log in.');
-        setShowWrongUserNameAndPasswordError(false);
+        setErrorMessage('');
       }
     }).catch(() => {
-      setRegisterResultMessage('Something went wrong');
+      setErrorMessage('Something went wrong');
     });
   }
 
@@ -55,9 +58,9 @@ export function LoginPage() {
     </div>
     <div className={"flex flex-col items-center"}>
       <div className={"lg:w-80 sm:w-3/4"}>
-        { showWrongUserNameAndPasswordError && (
+        { errorMessage && (
             <div className={"p-4 rounded bg-red-200 text-black"}>
-              Wrong username or password
+              { errorMessage }
             </div>
         )}
         { registerResultMessage && (