diff --git a/src/interface/web/app/agents/layout.tsx b/src/interface/web/app/agents/layout.tsx
index a11ede79..04855b43 100644
--- a/src/interface/web/app/agents/layout.tsx
+++ b/src/interface/web/app/agents/layout.tsx
@@ -6,7 +6,7 @@ import { ContentSecurityPolicy } from "../common/layoutHelper";
 export const metadata: Metadata = {
     title: "Khoj AI - Agents",
     description:
-        "Find or create a specialized agent that can help you address more specific needs.",
+        "Find or create agents with custom knowledge, tools and personalities to help address your specific needs.",
     icons: {
         icon: "/static/assets/icons/khoj_lantern.ico",
         apple: "/static/assets/icons/khoj_lantern_256x256.png",
@@ -15,7 +15,7 @@ export const metadata: Metadata = {
         siteName: "Khoj AI",
         title: "Khoj AI - Agents",
         description:
-            "Find or create a specialized agent that can help you address more specific needs.",
+            "Find or create agents with custom knowledge, tools and personalities to help address your specific needs.",
         url: "https://app.khoj.dev/agents",
         type: "website",
         images: [
diff --git a/src/interface/web/app/automations/layout.tsx b/src/interface/web/app/automations/layout.tsx
index c57e26c2..2d97af5c 100644
--- a/src/interface/web/app/automations/layout.tsx
+++ b/src/interface/web/app/automations/layout.tsx
@@ -6,7 +6,8 @@ import { ContentSecurityPolicy } from "../common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Automations",
-    description: "Use Automations with Khoj to simplify the process of running repetitive tasks.",
+    description:
+        "Use Khoj Automations to get tailored research and event based notifications directly in your inbox.",
     icons: {
         icon: "/static/assets/icons/khoj_lantern.ico",
         apple: "/static/assets/icons/khoj_lantern_256x256.png",
@@ -15,7 +16,7 @@ export const metadata: Metadata = {
         siteName: "Khoj AI",
         title: "Khoj AI - Automations",
         description:
-            "Use Automations with Khoj to simplify the process of running repetitive tasks.",
+            "Use Khoj Automations to get tailored research and event based notifications directly in your inbox.",
         url: "https://app.khoj.dev/automations",
         type: "website",
         images: [
diff --git a/src/interface/web/app/chat/layout.tsx b/src/interface/web/app/chat/layout.tsx
index fa31d2cd..25579510 100644
--- a/src/interface/web/app/chat/layout.tsx
+++ b/src/interface/web/app/chat/layout.tsx
@@ -6,7 +6,7 @@ import { ContentSecurityPolicy } from "../common/layoutHelper";
 export const metadata: Metadata = {
     title: "Khoj AI - Chat",
     description:
-        "Ask anything. Khoj will use the internet and your docs to answer, paint and even automate stuff for you.",
+        "Ask anything. Research answers from across the internet and your documents, draft messages, summarize documents, generate paintings and chat with personal agents.",
     icons: {
         icon: "/static/assets/icons/khoj_lantern.ico",
         apple: "/static/assets/icons/khoj_lantern_256x256.png",
@@ -15,7 +15,7 @@ export const metadata: Metadata = {
         siteName: "Khoj AI",
         title: "Khoj AI - Chat",
         description:
-            "Ask anything. Khoj will use the internet and your docs to answer, paint and even automate stuff for you.",
+            "Ask anything. Research answers from across the internet and your documents, draft messages, summarize documents, generate paintings and chat with personal agents.",
         url: "https://app.khoj.dev/chat",
         type: "website",
         images: [
diff --git a/src/interface/web/app/components/loginPrompt/loginPrompt.tsx b/src/interface/web/app/components/loginPrompt/loginPrompt.tsx
index b372a6ef..6af02f9b 100644
--- a/src/interface/web/app/components/loginPrompt/loginPrompt.tsx
+++ b/src/interface/web/app/components/loginPrompt/loginPrompt.tsx
@@ -150,7 +150,7 @@ export default function LoginPrompt(props: LoginPromptProps) {
             <Drawer open={true} onOpenChange={props.onOpenChange}>
                 <DrawerContent className={`flex flex-col gap-4 w-full mb-4`}>
                     <div>
-                        {useEmailSignIn && (
+                        {useEmailSignIn ? (
                             <EmailSignInContext
                                 email={email}
                                 setEmail={setEmail}
@@ -161,8 +161,7 @@ export default function LoginPrompt(props: LoginPromptProps) {
                                 setRecheckEmail={setRecheckEmail}
                                 handleMagicLinkSignIn={handleMagicLinkSignIn}
                             />
-                        )}
-                        {!useEmailSignIn && (
+                        ) : (
                             <MainSignInContext
                                 handleGoogleScriptLoad={handleGoogleScriptLoad}
                                 handleGoogleSignIn={handleGoogleSignIn}
@@ -184,7 +183,7 @@ export default function LoginPrompt(props: LoginPromptProps) {
                 className={`flex flex-col gap-4 ${!useEmailSignIn ? "p-0 pb-4 m-0 max-w-xl" : "w-fit"}`}
             >
                 <div>
-                    {useEmailSignIn && (
+                    {useEmailSignIn ? (
                         <EmailSignInContext
                             email={email}
                             setEmail={setEmail}
@@ -195,8 +194,7 @@ export default function LoginPrompt(props: LoginPromptProps) {
                             setRecheckEmail={setRecheckEmail}
                             handleMagicLinkSignIn={handleMagicLinkSignIn}
                         />
-                    )}
-                    {!useEmailSignIn && (
+                    ) : (
                         <MainSignInContext
                             handleGoogleScriptLoad={handleGoogleScriptLoad}
                             handleGoogleSignIn={handleGoogleSignIn}
@@ -403,18 +401,17 @@ function MainSignInContext({
         {
             src: "https://assets.khoj.dev/sign_in_demos/research_mode.gif",
             alt: "Research tip",
-            description: "Perform deeper research to get informed, accurate answers.",
+            description: "Simplify Deep Work",
         },
         {
             src: "https://assets.khoj.dev/sign_in_demos/custom_agents.gif",
             alt: "Personalize tip",
-            description:
-                "Create AI agents and customize their personality to discuss homework, office work or a hobby.",
+            description: "Personalize your AI",
         },
         {
             src: "https://assets.khoj.dev/sign_in_demos/docment_questions.gif",
             alt: "Document tip",
-            description: "Get verifiable answers from across the internet and your documents.",
+            description: "Ask Anything",
         },
     ];
 
@@ -473,7 +470,12 @@ function MainSignInContext({
                     variant="outline"
                     className="w-[300px] p-8 flex gap-2 items-center justify-center rounded-lg font-bold"
                     onClick={handleGoogleSignIn}
-                    disabled={isLoading || !data?.google}
+                    disabled={
+                        isLoading ||
+                        !data?.google ||
+                        !data?.google.client_id ||
+                        !data?.google.redirect_uri
+                    }
                 >
                     {isLoading ? (
                         <Spinner className="h-6 w-6" />
diff --git a/src/interface/web/app/layout.tsx b/src/interface/web/app/layout.tsx
index af16b2e2..3d2cd4f7 100644
--- a/src/interface/web/app/layout.tsx
+++ b/src/interface/web/app/layout.tsx
@@ -6,17 +6,19 @@ import { ContentSecurityPolicy } from "./common/layoutHelper";
 export const metadata: Metadata = {
     title: "Khoj AI - Ask Anything",
     description:
-        "Khoj is a model-agnostic, open-source personal research assistant. It helps you understand, create, and generate faster.",
+        "Khoj is a personal research assistant. It helps you understand better and create faster.",
     icons: {
         icon: "/static/assets/icons/khoj_lantern.ico",
         apple: "/static/assets/icons/khoj_lantern_256x256.png",
     },
     manifest: "/static/khoj.webmanifest",
+    keywords:
+        "research assistant, productivity, AI, Khoj, open source, model agnostic, research, productivity tool, personal assistant, personal research assistant, personal productivity assistant",
     openGraph: {
         siteName: "Khoj AI",
         title: "Khoj AI",
         description:
-            "Khoj is a model-agnostic, open-source personal research assistant. It helps you understand, create, and generate faster.",
+            "Khoj is a personal research assistant. It helps you understand better and create faster.",
         url: "https://app.khoj.dev",
         type: "website",
         images: [
diff --git a/src/interface/web/app/settings/layout.tsx b/src/interface/web/app/settings/layout.tsx
index ea6ce710..7a33477c 100644
--- a/src/interface/web/app/settings/layout.tsx
+++ b/src/interface/web/app/settings/layout.tsx
@@ -15,7 +15,7 @@ export const metadata: Metadata = {
     openGraph: {
         siteName: "Khoj AI",
         title: "Khoj AI - Settings",
-        description: "Setup, configure, and personalize Khoj. your AI-powered research assistant.",
+        description: "Setup, configure, and personalize Khoj, your AI research assistant.",
         url: "https://app.khoj.dev/settings",
         type: "website",
         images: [
diff --git a/src/interface/web/app/share/chat/layout.tsx b/src/interface/web/app/share/chat/layout.tsx
index 3be67eb5..17433009 100644
--- a/src/interface/web/app/share/chat/layout.tsx
+++ b/src/interface/web/app/share/chat/layout.tsx
@@ -6,7 +6,7 @@ import { ContentSecurityPolicy } from "@/app/common/layoutHelper";
 export const metadata: Metadata = {
     title: "Khoj AI - Ask Anything",
     description:
-        "Ask anything. Khoj will use the internet and your docs to answer, paint and even automate stuff for you.",
+        "Ask anything. Research answers from across the internet and your documents, draft messages, summarize documents, generate paintings and chat with personal agents.",
     icons: {
         icon: "/static/assets/icons/khoj_lantern.ico",
         apple: "/static/assets/icons/khoj_lantern_256x256.png",
@@ -15,7 +15,7 @@ export const metadata: Metadata = {
         siteName: "Khoj AI",
         title: "Khoj AI - Ask Anything",
         description:
-            "Ask anything. Khoj will use the internet and your docs to answer, paint and even automate stuff for you.",
+            "Ask anything. Research answers from across the internet and your documents, draft messages, summarize documents, generate paintings and chat with personal agents.",
         url: "https://app.khoj.dev/chat",
         type: "website",
         images: [
diff --git a/src/khoj/interface/email/magic_link.html b/src/khoj/interface/email/magic_link.html
index 3f7a54f5..305c5fba 100644
--- a/src/khoj/interface/email/magic_link.html
+++ b/src/khoj/interface/email/magic_link.html
@@ -29,7 +29,7 @@
         <p style="font-size: 16px; color: #333; margin-bottom: 20px;">You're about to get a whole lot more productive.
         </p>
 
-        <div style="font-size: 18px; font-weight: bold; margin-top: 30px; text-align: right;">- The Khoj Team</div>
+        <div style="font-size: 14px; color: #555; margin-top: 30px;">- The Khoj Team</div>
 
         <div style="margin-top: 30px; text-align: center;">
             <a href="https://docs.khoj.dev" target="_blank"
diff --git a/src/khoj/routers/auth.py b/src/khoj/routers/auth.py
index b509335f..f1c2f66c 100644
--- a/src/khoj/routers/auth.py
+++ b/src/khoj/routers/auth.py
@@ -157,7 +157,7 @@ async def auth_post(request: Request):
     form = await request.form()
     next_url = get_next_url(request)
     for q in request.query_params:
-        if not q == "next":
+        if q != "next":
             next_url += f"&{q}={request.query_params[q]}"
 
     credential = form.get("credential")
@@ -202,7 +202,7 @@ async def auth(request: Request):
     for q in request.query_params:
         if q in ["code", "state", "scope", "authuser", "prompt", "session_state", "access_type"]:
             continue
-        if not q == "next":
+        if q != "next":
             next_url += f"&{q}={request.query_params[q]}"
 
     code = request.query_params.get("code")
diff --git a/src/khoj/routers/email.py b/src/khoj/routers/email.py
index 1f60a1ba..8de527cd 100644
--- a/src/khoj/routers/email.py
+++ b/src/khoj/routers/email.py
@@ -47,7 +47,7 @@ async def send_magic_link_email(email, unique_id, host):
         {
             "sender": os.environ.get("RESEND_EMAIL", "noreply@khoj.dev"),
             "to": email,
-            "subject": f"Your unique login to Khoj",
+            "subject": f"Your login code to Khoj",
             "html": html_content,
         }
     )