diff --git a/src/components/AppBar/AppBar.tsx b/src/components/AppBar/AppBar.tsx
index 76d8370..8c7ac63 100644
--- a/src/components/AppBar/AppBar.tsx
+++ b/src/components/AppBar/AppBar.tsx
@@ -137,7 +137,7 @@ export const AppBar = () => {
               <Button
                 startIcon={<ButtonIcon />}
                 onClick={() => {
-                  navigate(appPublicRoutes.login)
+                  navigate(appPublicRoutes.nostr)
                 }}
                 variant="contained"
               >
diff --git a/src/layouts/modal/index.tsx b/src/layouts/modal/index.tsx
index 42825ce..7b29379 100644
--- a/src/layouts/modal/index.tsx
+++ b/src/layouts/modal/index.tsx
@@ -93,6 +93,10 @@ export const Modal = () => {
               )
             })}
           </ul>
+          {activeTab === appPublicRoutes.login ||
+          activeTab === appPublicRoutes.register ? (
+            <div className={styles.comingSoon}>Coming soon!</div>
+          ) : null}
           <div className={styles.tabContent}>
             <Outlet />
           </div>
diff --git a/src/layouts/modal/style.module.scss b/src/layouts/modal/style.module.scss
index e2537b9..f7dd2fc 100644
--- a/src/layouts/modal/style.module.scss
+++ b/src/layouts/modal/style.module.scss
@@ -66,6 +66,14 @@ $default-modal-padding: 15px 25px;
   padding-inline: 10px;
 }
 
+.comingSoon {
+  padding: 15px;
+  color: rgba(0, 0, 0, 0.5);
+  text-align: center;
+  font-weight: 400;
+  font-size: 16px;
+}
+
 .footer {
   padding: 15px;
   border-top: solid 1px rgba(0, 0, 0, 0.1);
diff --git a/src/pages/landing/index.tsx b/src/pages/landing/index.tsx
index de43f59..015d721 100644
--- a/src/pages/landing/index.tsx
+++ b/src/pages/landing/index.tsx
@@ -25,7 +25,7 @@ export const LandingPage = () => {
   const location = useLocation()
 
   const onSignInClick = async () => {
-    navigate(appPublicRoutes.login)
+    navigate(appPublicRoutes.nostr)
   }
 
   const cards = [
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index f31e0a5..e6933c6 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -1,6 +1,8 @@
 import { Button, TextField } from '@mui/material'
 
 export const Login = () => {
+  // TODO: All fields, buttons are disabled
+  // Feature not implemented
   return (
     <>
       <TextField
@@ -9,6 +11,7 @@ export const Login = () => {
         fullWidth
         margin="dense"
         autoComplete="username"
+        disabled
       />
       <TextField
         label="Password"
@@ -16,9 +19,10 @@ export const Login = () => {
         fullWidth
         margin="dense"
         autoComplete="current-password"
+        disabled
       />
 
-      <Button variant="contained" fullWidth>
+      <Button variant="contained" fullWidth disabled>
         Login
       </Button>
     </>
diff --git a/src/pages/register/index.tsx b/src/pages/register/index.tsx
index c760edc..6163fea 100644
--- a/src/pages/register/index.tsx
+++ b/src/pages/register/index.tsx
@@ -1,6 +1,8 @@
 import { Button, TextField } from '@mui/material'
 
 export const Register = () => {
+  // TODO: All fields, buttons are disabled
+  // Feature not implemented
   return (
     <>
       <TextField
@@ -9,6 +11,7 @@ export const Register = () => {
         fullWidth
         margin="dense"
         autoComplete="username"
+        disabled
       />
       <TextField
         label="Password"
@@ -17,6 +20,7 @@ export const Register = () => {
         margin="dense"
         type="password"
         autoComplete="new-password"
+        disabled
       />
       <TextField
         label="Confirm password"
@@ -25,9 +29,10 @@ export const Register = () => {
         margin="dense"
         type="password"
         autoComplete="new-password"
+        disabled
       />
 
-      <Button variant="contained" fullWidth>
+      <Button variant="contained" fullWidth disabled>
         Register
       </Button>
     </>
diff --git a/src/theme/index.ts b/src/theme/index.ts
index 60cd68e..4a1e0ab 100644
--- a/src/theme/index.ts
+++ b/src/theme/index.ts
@@ -55,7 +55,10 @@ export const theme = extendTheme({
         },
         contained: {
           background: 'var(--primary-main)',
-          color: 'white'
+          color: 'white',
+          ':hover': {
+            color: 'white'
+          }
         },
         outlined: {
           ':hover': {