diff --git a/components/HeaderMenu/index.scss b/components/HeaderMenu/index.scss
index bda86d8c..1d96f57d 100644
--- a/components/HeaderMenu/index.scss
+++ b/components/HeaderMenu/index.scss
@@ -12,7 +12,7 @@
     color: $grey-40;
     font-weight: $normal;
 
-    &:hover {
+    &:hover:not(.disabled) {
         background: $grey-100;
         color: $grey-00;
         cursor: pointer;
@@ -26,10 +26,28 @@
         color: $grey-40;
     }
 
-    a, span {
+    & > a, & > span {
         display: block;
         padding: 12px;
     }
+
+    & > div {
+        align-items: center;
+        display: flex;
+        flex-direction: row;
+        padding: 10px 12px;
+
+        span {
+            flex-grow: 1;
+        }
+
+        &:hover {
+            i.tag {
+                background: $grey-60;
+                color: white;
+            }
+        }
+    }
 }
 
 .MenuGroup {
diff --git a/components/HeaderMenu/index.tsx b/components/HeaderMenu/index.tsx
index 7a72a754..66ee0398 100644
--- a/components/HeaderMenu/index.tsx
+++ b/components/HeaderMenu/index.tsx
@@ -1,14 +1,13 @@
 import React from 'react'
 import Link from 'next/link'
+import { useSnapshot } from 'valtio'
 
-import LoginModal from '~components/LoginModal'
-import SignupModal from '~components/SignupModal'
-
-import { useModal as useSignupModal } from '~utils/useModal'
-import { useModal as useLoginModal } from '~utils/useModal'
-import { useModal as useAboutModal } from '~utils/useModal'
+import { accountState } from '~utils/accountState'
 
 import AboutModal from '~components/AboutModal'
+import AccountModal from '~components/AccountModal'
+import LoginModal from '~components/LoginModal'
+import SignupModal from '~components/SignupModal'
 
 import './index.scss'
 
@@ -19,13 +18,14 @@ interface Props {
 }
 
 const HeaderMenu = (props: Props) => {
+    const { account } = useSnapshot(accountState)
     function authItems() {
         return (
             <nav>
                 <ul className="Menu auth">
                     <div className="MenuGroup">
                         <li className="MenuItem">
-                            <Link href={`/${props.username}` || ''}>{props.username}</Link>
+                            <Link href={`/${account.user?.username}` || ''}>{account.user?.username}</Link>
                         </li>
                         <li className="MenuItem">
                             <Link href={`/saved` || ''}>Saved</Link>
@@ -36,15 +36,16 @@ const HeaderMenu = (props: Props) => {
                             <Link href='/teams'>Teams</Link>
                         </li>
 
-                        <li className="MenuItem">
-                            <Link href='/guides'>Guides</Link>
+                        <li className="MenuItem disabled">
+                            <div>
+                                <span>Guides</span>
+                                <i className="tag">Coming Soon</i>
+                            </div>
                         </li>
                     </div>
                     <div className="MenuGroup">
                         <AboutModal />
-                        <li className="MenuItem">
-                            <span>Settings</span>
-                        </li>
+                        <AccountModal />
                         <li className="MenuItem" onClick={props.logout}>
                             <span>Logout</span>
                         </li>