diff --git a/apps/partners/src/app/login/page.tsx b/apps/partners/src/app/login/page.tsx
index ce8c24b2..0a507094 100644
--- a/apps/partners/src/app/login/page.tsx
+++ b/apps/partners/src/app/login/page.tsx
@@ -29,5 +29,5 @@ export const metadata = {
 };
 
 export default function Page() {
-  return <Login redirectPath="/dashboard" />;
+  return <Login redirectPath="/dashboard" className="mt-36" />;
 }
diff --git a/apps/social/src/app/(authentication)/login/page.tsx b/apps/social/src/app/(authentication)/login/page.tsx
index 0f4c1c37..577ed8d2 100644
--- a/apps/social/src/app/(authentication)/login/page.tsx
+++ b/apps/social/src/app/(authentication)/login/page.tsx
@@ -29,5 +29,5 @@ export const metadata = {
 };
 
 export default function Page() {
-  return <Login redirectPath="/" />;
+  return <Login redirectPath="/" className="mt-16" />;
 }
diff --git a/apps/social/src/app/(authentication)/register/page.tsx b/apps/social/src/app/(authentication)/register/page.tsx
index 0d20715d..8e3e99c1 100644
--- a/apps/social/src/app/(authentication)/register/page.tsx
+++ b/apps/social/src/app/(authentication)/register/page.tsx
@@ -29,5 +29,5 @@ export const metadata = {
 };
 
 export default function Page() {
-  return <Register redirectPath="/" />;
+  return <Register redirectPath="/" className="mt-16" />;
 }
diff --git a/apps/www/src/app/(authentication)/login/page.tsx b/apps/www/src/app/(authentication)/login/page.tsx
index b0ee0089..777c93a0 100644
--- a/apps/www/src/app/(authentication)/login/page.tsx
+++ b/apps/www/src/app/(authentication)/login/page.tsx
@@ -29,5 +29,5 @@ export const metadata = {
 };
 
 export default function Page() {
-  return <Login redirectPath="/inbox" />;
+  return <Login redirectPath="/inbox" className="mt-36" />;
 }
diff --git a/apps/www/src/app/(authentication)/register/page.tsx b/apps/www/src/app/(authentication)/register/page.tsx
index 31d1ed89..3d3364e5 100644
--- a/apps/www/src/app/(authentication)/register/page.tsx
+++ b/apps/www/src/app/(authentication)/register/page.tsx
@@ -29,5 +29,5 @@ export const metadata = {
 };
 
 export default function Page() {
-  return <Register redirectPath="/inbox" />;
+  return <Register redirectPath="/inbox" className="mt-36" />;
 }
diff --git a/packages/shared/src/login/loading.tsx b/packages/shared/src/login/loading.tsx
index 5ba9d85f..4d864e82 100644
--- a/packages/shared/src/login/loading.tsx
+++ b/packages/shared/src/login/loading.tsx
@@ -2,7 +2,7 @@ import { Skeleton } from "@umamin/ui/components/skeleton";
 
 export default function Loading() {
   return (
-    <div className="max-w-lg md:max-w-md container mt-36 [&>div]:gap-3 [&>div]:flex [&>div]:flex-col flex gap-8 flex-col">
+    <div className="max-w-lg md:max-w-md container mt-16 [&>div]:gap-3 [&>div]:flex [&>div]:flex-col flex gap-8 flex-col">
       <div>
         <Skeleton className="w-2/5 h-[25px] rounded-md" />
         <Skeleton className="w-1/2 h-[10px] rounded-md" />
diff --git a/packages/shared/src/login/page.tsx b/packages/shared/src/login/page.tsx
index 7ee85b2e..3164c193 100644
--- a/packages/shared/src/login/page.tsx
+++ b/packages/shared/src/login/page.tsx
@@ -2,6 +2,7 @@ import Link from "next/link";
 import dynamic from "next/dynamic";
 import { redirect } from "next/navigation";
 import { LoginForm } from "./components/form";
+import { cn } from "@umamin/shared/lib/utils";
 import { getSession } from "@umamin/shared/lib/auth";
 
 const BrowserWarning = dynamic(
@@ -11,8 +12,10 @@ const BrowserWarning = dynamic(
 
 export default async function Login({
   redirectPath,
+  className,
 }: {
   redirectPath: string;
+  className?: string;
 }) {
   const { user } = await getSession();
 
@@ -21,27 +24,28 @@ export default async function Login({
   }
 
   return (
-    <>
+    <section
+      className={cn("max-w-lg md:max-w-md container min-h-screen", className)}
+    >
       <BrowserWarning />
-      <section className="max-w-lg md:max-w-md container mt-36 min-h-screen">
-        <div className="mb-6">
-          <h2 className="text-2xl tracking-tight font-semibold">
-            Umamin Account
-          </h2>
-          <p className="text-sm text-muted-foreground">
-            Proceed with your Umamin v2.0 profile
-          </p>
-        </div>
 
-        <LoginForm />
+      <div className="mb-6">
+        <h2 className="text-2xl tracking-tight font-semibold">
+          Continue with Umamin
+        </h2>
+        <p className="text-sm text-muted-foreground">
+          Proceed with your created Umamin Account
+        </p>
+      </div>
 
-        <div className="mt-4 text-center text-sm w-full">
-          Don&apos;t have an account?{" "}
-          <Link href="/register" className="underline">
-            Sign up
-          </Link>
-        </div>
-      </section>
-    </>
+      <LoginForm />
+
+      <div className="mt-4 text-center text-sm w-full">
+        Don&apos;t have an account?{" "}
+        <Link href="/register" className="underline">
+          Sign up
+        </Link>
+      </div>
+    </section>
   );
 }
diff --git a/packages/shared/src/register/loading.tsx b/packages/shared/src/register/loading.tsx
index d623ffdd..a095cf25 100644
--- a/packages/shared/src/register/loading.tsx
+++ b/packages/shared/src/register/loading.tsx
@@ -2,7 +2,7 @@ import { Skeleton } from "@umamin/ui/components/skeleton";
 
 export default function Loading() {
   return (
-    <div className="container max-w-xl lg:mt-36 mt-28 mx-auto ">
+    <div className="container max-w-xl lg:mt-24 mt-16 mx-auto ">
       <div className="flex flex-col gap-4">
         <div className="flex gap-3">
           <Skeleton className="size-16 md:size-20 rounded-full" />
diff --git a/packages/shared/src/register/page.tsx b/packages/shared/src/register/page.tsx
index ef2f2566..92c0a310 100644
--- a/packages/shared/src/register/page.tsx
+++ b/packages/shared/src/register/page.tsx
@@ -1,6 +1,7 @@
 import Link from "next/link";
 import dynamic from "next/dynamic";
 import { redirect } from "next/navigation";
+import { cn } from "@umamin/shared/lib/utils";
 import { RegisterForm } from "./components/form";
 import { getSession } from "@umamin/shared/lib/auth";
 
@@ -11,8 +12,10 @@ const BrowserWarning = dynamic(
 
 export default async function Register({
   redirectPath,
+  className,
 }: {
   redirectPath: string;
+  className?: string;
 }) {
   const { user } = await getSession();
 
@@ -21,7 +24,9 @@ export default async function Register({
   }
 
   return (
-    <section className="max-w-lg md:max-w-md container mt-36 min-h-screen">
+    <section
+      className={cn("max-w-lg md:max-w-md container min-h-screen", className)}
+    >
       <BrowserWarning />
 
       <div className="mb-6">