diff --git a/frontend/app/src/components/AuthModal.tsx b/frontend/app/src/components/AuthModal.tsx
index eb6631e..1db1f8a 100644
--- a/frontend/app/src/components/AuthModal.tsx
+++ b/frontend/app/src/components/AuthModal.tsx
@@ -72,17 +72,17 @@ const AuthModal = (props: {
   ];
 
   return (
-    <Spin spinning={isLoggingIn || isRegistering}>
-      <Modal
-        open={props.open}
-        onCancel={() => props.setOpen(false)}
-        onOk={() => {
-          current === "register" && registerForm.submit();
-          current === "login" && loginForm.submit();
-        }}
-        okText={current === "login" ? "Log In" : "Register"}
-        confirmLoading={isLoggingIn}
-      >
+    <Modal
+      open={props.open}
+      onCancel={() => props.setOpen(false)}
+      onOk={() => {
+        current === "register" && registerForm.submit();
+        current === "login" && loginForm.submit();
+      }}
+      okText={current === "login" ? "Log In" : "Register"}
+      confirmLoading={isLoggingIn}
+    >
+      <Spin spinning={isLoggingIn || isRegistering}>
         <Menu
           onClick={(e) => setCurrent(e.key)}
           mode="horizontal"
@@ -182,8 +182,8 @@ const AuthModal = (props: {
             </Form.Item>
           </Form>
         )}
-      </Modal>
-    </Spin>
+      </Spin>
+    </Modal>
   );
 };
 
diff --git a/frontend/app/src/components/HeaderComponent.tsx b/frontend/app/src/components/HeaderComponent.tsx
index 8ba67cc..d87470e 100644
--- a/frontend/app/src/components/HeaderComponent.tsx
+++ b/frontend/app/src/components/HeaderComponent.tsx
@@ -43,7 +43,7 @@ const HeaderComponent = () => {
       ),
       key: "login",
       icon: <UserOutlined />,
-      onClick: () => !user && setAuthModalOpen(true),
+      onClick: () => (user ? setUserMenuOpen(true) : setAuthModalOpen(true)),
     },
   ];