diff --git a/src/main/client/src/components/styling/auth.css b/src/main/client/src/components/styling/auth.css
index 7d04f97..db2d369 100644
--- a/src/main/client/src/components/styling/auth.css
+++ b/src/main/client/src/components/styling/auth.css
@@ -46,10 +46,6 @@ body {
 .login {
     width: 320px;
     gap: 1.5rem;
-
-    a {
-        padding: 0;
-    }
 }
 
 .register {
diff --git a/src/main/client/src/main.tsx b/src/main/client/src/main.tsx
index 54024e9..c324f90 100644
--- a/src/main/client/src/main.tsx
+++ b/src/main/client/src/main.tsx
@@ -12,12 +12,17 @@ import { PrivateRoutes } from "./components/PrivateRoutes";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { Login } from "./routes/Login/Login.tsx";
 import { Approvals } from "@/routes/Approvals";
+import { Register } from "./routes/Register/Register.tsx";
 
 const router = createBrowserRouter([
   {
     path: "/login",
     element: <Login />
   },
+  {
+    path: "/register",
+    element: <Register/>
+  },
   {
     path: "/",
     element: <PrivateRoutes />,
diff --git a/src/main/client/src/routes/Login/Login.tsx b/src/main/client/src/routes/Login/Login.tsx
index a5bde86..3ba1428 100644
--- a/src/main/client/src/routes/Login/Login.tsx
+++ b/src/main/client/src/routes/Login/Login.tsx
@@ -6,6 +6,7 @@ import { useMutation } from "@tanstack/react-query";
 import Loading from "../../components/Loader";
 
 import { useAuth } from "../../hooks/UseAuth.tsx";
+import axios from "axios";
 
 export const Login = () => {
   const username = useRef<HTMLInputElement>(null);
@@ -32,7 +33,7 @@ export const Login = () => {
 
   };
 
-  const { mutate, isError, isPending } = useMutation({
+  const { mutate, isError, isPending, error } = useMutation({
     mutationFn: loginUser,
     onSuccess: (data) => {
       localStorage.setItem("token", data.data.token);
@@ -47,9 +48,8 @@ export const Login = () => {
   return (
     <>
       <div className="auth__split"></div>
-      {isPending ? <Loading /> :
+      {isPending ? <div className="auth register"><Loading /></div> :
         <div className="auth login">
-          <h1>Login</h1>
           <div className="input__container">
             <div className="input__label">
               <p>Username</p>
@@ -59,7 +59,6 @@ export const Login = () => {
                    id="id_username" />
           </div>
 
-
           <div className="input__container">
             <div className="input__label">
               <p>Password</p>
@@ -68,12 +67,11 @@ export const Login = () => {
                    autoComplete="current-password"
                    required
                    id="id_password" />
-            {isError &&
-              <div className="input__error">
-                <p>Password or Username is wrong</p>
-              </div>
-            }
-
+          { isError && axios.isAxiosError(error) &&
+            <div className="input__error">
+              <p>{error?.response?.data.message || "Password or Username is wrong"}</p>
+            </div>
+          }
           </div>
 
           <div style={{ display: "grid" }}>
@@ -82,6 +80,5 @@ export const Login = () => {
           <Link className="styled__button floating" to="/register">Register</Link>
         </div>}
     </>
-
   );
 };
\ No newline at end of file
diff --git a/src/main/client/src/routes/Register/Register.tsx b/src/main/client/src/routes/Register/Register.tsx
new file mode 100644
index 0000000..03dda27
--- /dev/null
+++ b/src/main/client/src/routes/Register/Register.tsx
@@ -0,0 +1,142 @@
+import { Link, useNavigate } from "react-router-dom";
+import "../../components/styling/auth.css";
+import { useRef } from "react";
+import { useErgonClient } from "../../hooks/useErgonClient/useErgonClient.tsx";
+import { useMutation } from "@tanstack/react-query";
+import Loading from "../../components/Loader";
+import axios from "axios";
+
+export const Register = () => {
+    const username = useRef<HTMLInputElement>(null);
+    const password = useRef<HTMLInputElement>(null);
+    const confirmPassword = useRef<HTMLInputElement>(null);
+    const email = useRef<HTMLInputElement>(null);
+    const firstName = useRef<HTMLInputElement>(null);
+    const lastName = useRef<HTMLInputElement>(null);
+    const dob = useRef<HTMLInputElement>(null);
+    const client = useErgonClient();
+    const navigate = useNavigate();
+
+    const registerUser = async () => {
+        const user = username.current?.value;
+        const pass = password.current?.value;
+        const confirmPass = confirmPassword.current?.value;
+        const userEmail = email.current?.value;
+        const fName = firstName.current?.value;
+        const lName = lastName.current?.value;
+        const dateOfBirth = dob.current?.value;
+
+        if (pass !== confirmPass) {
+            throw new Error("Passwords do not match");
+        }
+
+        return await client.post("/auth/registration", {
+            username: user,
+            password: pass,
+            matchingPassword: confirmPass,
+            email: userEmail,
+            firstName: fName,
+            lastName: lName,
+            dob: dateOfBirth
+        });
+    };
+
+    const { mutate, isError, isPending, error } = useMutation({
+        mutationFn: registerUser,
+        onSuccess: () => {
+            navigate("/login");
+        }
+    });
+
+    const handleRegister = () => {
+        mutate();
+    };
+
+    return (
+        <>
+            <div className="auth__split"></div>
+            {isPending ? <div className="loader-container"><Loading /></div> :
+                <div className="auth register">
+                    <h1 className="text-4xl font-bold text-left">Register</h1>
+                    <section>
+                        <div className="input__container">
+                            <div className="input__label">
+                                <p>First Name</p>
+                            </div>
+                            <input className="input__field" type="text" name="firstName" ref={firstName} autoComplete="given-name"
+                                maxLength={150} required
+                                id="id_first_name" />
+                        </div>
+
+                        <div className="input__container">
+                            <div className="input__label">
+                                <p>Last Name</p>
+                            </div>
+                            <input className="input__field" type="text" name="lastName" ref={lastName} autoComplete="family-name"
+                                maxLength={150} required
+                                id="id_last_name" />
+                        </div>
+                    </section>
+                    <section>
+                        <div className="input__container">
+                            <div className="input__label">
+                                <p>Username</p>
+                            </div>
+                            <input className="input__field" type="text" name="username" ref={username} autoComplete="username"
+                                maxLength={150} required
+                                id="id_username" />
+                        </div>
+
+                        <div className="input__container">
+                            <div className="input__label">
+                                <p>Date of Birth</p>
+                            </div>
+                            <input className="input__field" type="date" name="dob" ref={dob} autoComplete="bday"
+                                required
+                                id="id_dob" />
+                        </div>
+                    </section>
+
+
+                    <div className="input__container">
+                        <div className="input__label">
+                            <p>Email</p>
+                        </div>
+                        <input className="input__field" type="email" name="email" ref={email} autoComplete="email"
+                            maxLength={150} required
+                            id="id_email" />
+                    </div>
+                    <section>
+                        <div className="input__container">
+                            <div className="input__label">
+                                <p>Password</p>
+                            </div>
+                            <input className="input__field" type="password" name="password" ref={password}
+                                autoComplete="new-password"
+                                required
+                                id="id_password" />
+                        </div>
+
+                        <div className="input__container">
+                            <div className="input__label">
+                                <p>Confirm Password</p>
+                            </div>
+                            <input className="input__field" type="password" name="confirmPassword" ref={confirmPassword}
+                                autoComplete="new-password"
+                                required
+                                id="id_confirm_password" />
+                        </div>
+                    </section>
+                    { isError && axios.isAxiosError(error) &&
+                        <div className="input__error">
+                        <p>{error?.response?.data.message || "Registration failed, and its not my code, its you with your weird input"}</p>
+                        </div>
+                    }
+                    <div style={{ display: "grid" }}>
+                        <button onClick={handleRegister} className="styled__button" type="submit"> Register</button>
+                    </div>
+                    <Link className="styled__button floating" to="/login">Login</Link>
+                </div>}
+        </>
+    );
+};
\ No newline at end of file
diff --git a/src/main/java/com/tibs/Ergon/controller/AuthController.java b/src/main/java/com/tibs/Ergon/controller/AuthController.java
index dffc392..619faac 100644
--- a/src/main/java/com/tibs/Ergon/controller/AuthController.java
+++ b/src/main/java/com/tibs/Ergon/controller/AuthController.java
@@ -39,7 +39,7 @@ public AuthController(AuthenticationManager authenticationManager, JwtUtil jwtUt
     @PostMapping("/login")
     public ResponseEntity<?> createAuthenticationToken(@RequestBody AuthRequest authRequest) {
         try {
-            log.info("Attempting to authenticate user: %s" + authRequest.getUsername());
+            log.info("Attempting to authenticate user: " + authRequest.getUsername());
             authenticationManager.authenticate(
                     new UsernamePasswordAuthenticationToken(authRequest.getUsername(), authRequest.getPassword())
             );