diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e815b4..c47ed59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project follows [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [1.5.4] - 2026-08-07
+
+### Fixed
+
+- The homepage "Join Us" button sent logged-in users to the registration page instead of somewhere useful. It now shows "My Dashboard" and links to their dashboard when a user is already logged in.
+
 ## [1.5.3] - 2026-08-07
 
 ### Fixed
diff --git a/backend/package.json b/backend/package.json
index 7865495..5f503da 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "event-management-backend",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Event Management System Backend",
   "main": "src/index.js",
   "scripts": {
diff --git a/frontend/package.json b/frontend/package.json
index 57bd399..2921391 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hope-events-frontend",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
index b923672..fee5de1 100644
--- a/frontend/src/app/page.tsx
+++ b/frontend/src/app/page.tsx
@@ -1,8 +1,9 @@
 import { EventCard } from "@/components/events/EventCard";
 import { Navbar } from "@/components/layout/Navbar";
 import { Footer } from "@/components/layout/Footer";
+import { JoinUsButton } from "@/components/home/JoinUsButton";
 import { appName } from "@/lib/siteConfig";
-import { Calendar, UserPlus, ArrowRight, CalendarCheck, Users, Heart, ShieldCheck } from "lucide-react";
+import { Calendar, ArrowRight, CalendarCheck, Users, Heart, ShieldCheck } from "lucide-react";
 
 type Event = {
   id: string;
@@ -58,10 +59,7 @@ export default async function HomePage() {
                                 <Calendar className="w-4 h-4" />
                                 View Events
                             </a>
-                            <a href="/register" className="inline-flex items-center gap-2 px-6 py-2.5 border border-brand-600 text-brand-600 rounded-xl hover:bg-brand-50 font-medium transition-colors">
-                                <UserPlus className="w-4 h-4" />
-                                Join Us
-                            </a>
+                            <JoinUsButton />
                         </div>
                     </div>
                 </section>
diff --git a/frontend/src/components/home/JoinUsButton.tsx b/frontend/src/components/home/JoinUsButton.tsx
new file mode 100644
index 0000000..18ca3d3
--- /dev/null
+++ b/frontend/src/components/home/JoinUsButton.tsx
@@ -0,0 +1,23 @@
+"use client";
+
+import Link from "next/link";
+import { UserPlus, LayoutDashboard } from "lucide-react";
+import { useAuth } from "@/hooks/useAuth";
+
+export const JoinUsButton = () => {
+    const { user, loading } = useAuth();
+
+    if (loading) return null;
+
+    return user ? (
+        <Link href="/dashboard/user" className="inline-flex items-center gap-2 px-6 py-2.5 border border-brand-600 text-brand-600 rounded-xl hover:bg-brand-50 font-medium transition-colors">
+            <LayoutDashboard className="w-4 h-4" />
+            My Dashboard
+        </Link>
+    ) : (
+        <Link href="/register" className="inline-flex items-center gap-2 px-6 py-2.5 border border-brand-600 text-brand-600 rounded-xl hover:bg-brand-50 font-medium transition-colors">
+            <UserPlus className="w-4 h-4" />
+            Join Us
+        </Link>
+    );
+};
diff --git a/package.json b/package.json
index ced82db..cc6fd9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hope-events",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "main": "index.js",
   "scripts": {
     "dev:backend": "cd backend && npm run dev",