diff --git a/src/app/myticket/page.jsx b/src/app/myticket/page.jsx
index 38cc3da..f11ac67 100644
--- a/src/app/myticket/page.jsx
+++ b/src/app/myticket/page.jsx
@@ -5,7 +5,6 @@ import { onAuthStateChanged } from 'firebase/auth'
 import { useRouter } from 'next/navigation'
 import React, { useContext, useEffect, useState } from 'react'
 import '../../styles/globals.css'
-import { SubmitButton } from '../../components/shared/SubmitButton'
 
 import { database, auth } from '../../firebase/firebase'
 import { Headings, HeadBox } from '../../components/shared/Heading'
@@ -49,7 +48,7 @@ const MyTicketPage = () => {
   const router = useRouter()
 
   const [ticketInfo, setTicketInfo] = useState({
-    name: '',
+    name: currentUser?.displayName || '',
     teamName: '',
     email: '',
     bgcolor: '',
@@ -65,7 +64,7 @@ const MyTicketPage = () => {
       }
     })
     return () => {
-      unsubscribe() // Unsubscribe from the event when the component unmounts
+      unsubscribe()
     }
   }, [currentUser, router])
 
@@ -85,6 +84,9 @@ const MyTicketPage = () => {
       if (snapshot.exists()) {
         const tickets = snapshot.val()
         const lastTicketKey = Object.keys(tickets).pop()
+        const previousTicket = Object.keys(tickets)[Object.keys(tickets).length - 1]
+        console.log('Last Ticket Key:', lastTicketKey)
+        console.log('Previous Ticket:', previousTicket)
         setTicketInfo({
           name: tickets[lastTicketKey].name || currentUser.displayName,
           teamName: tickets[lastTicketKey].teamName,
@@ -110,15 +112,19 @@ const MyTicketPage = () => {
         ? ref(database, `tickets/${currentUser.uid}/${existingTicketKey}`)
         : push(ticketRef)
 
-      // Use a promise to wait for the update operation to complete
+      // promise for the update
       const updatePromise = update(updateRef, {
         ...ticketInfo,
         bgcolor: ticketInfo.bgcolor || colors[0],
-        email: currentUser.email,
+        gmail: currentUser.email,
+        googleName: currentUser.displayName,
         ticketId: existingTicketKey ? ticketInfo.ticketId : ticketInfo.ticketId + 1
       })
       updatePromise.then(() => {
+        const newTicketKey = existingTicketKey || updateRef.key
         setShowModal(true)
+        console.log('Ticket generated successfully', ticketInfo)
+        console.log('with ID', newTicketKey, 'for User', currentUser.uid)
       })
     }
   }
@@ -138,7 +144,7 @@ const MyTicketPage = () => {
               <Input
                 type="text"
                 name="name"
-                placeholder="Name"
+                placeholder={ticketInfo.name ? ticketInfo.name : 'Name'}
                 value={ticketInfo.name}
                 onChange={handleChange}
               />
diff --git a/src/components/SignUp.jsx b/src/components/SignUp.jsx
index 0fe8913..cd3a9c4 100644
--- a/src/components/SignUp.jsx
+++ b/src/components/SignUp.jsx
@@ -17,11 +17,10 @@ import {
   ButtonBox,
   ToggleButton,
   Btn,
-  Login,
-  Register,
   CardsA,
   CardsB,
-  CardImage
+  CardImage,
+  InputGroup
 } from './signup.styles'
 
 import { AuthLogoLinks } from '../config/AuthProviders'
@@ -29,7 +28,8 @@ import { AuthLogoLinks } from '../config/AuthProviders'
 import {
   signUpWithEmailAndPassword,
   signUpWithGitHub,
-  signUpWithGoogle
+  signUpWithGoogle,
+  signInWithEmailAndPass
 } from '../firebase/signupAuth'
 
 const SignUp = () => {
@@ -43,10 +43,29 @@ const SignUp = () => {
 
   const handleSignUp = async () => {
     try {
-      await signUpWithEmailAndPassword(email, password, name)
-      router.push('/myticket')
+      const user = await signUpWithEmailAndPassword(email, password, name)
+      if (user) {
+        router.push('/myticket')
+      }
     } catch (error) {
       console.error('Signup error:', error.message)
+      if (error.code === 'auth/invalid-email') {
+        document.getElementById('signup-email').style.border = '1px solid red'
+      } else if (error.code === 'auth/weak-password') {
+        document.getElementById('signup-password').style.border = '1px solid yellow'
+      }
+    }
+  }
+  const handleSignIn = async () => {
+    try {
+      const user = await signInWithEmailAndPass(email, password)
+      if (user) {
+        router.push('/myticket')
+      }
+    } catch (error) {
+      console.error('Signin error:', error.message)
+      document.getElementById('signin-password').style.border = '1px solid red'
+      document.getElementById('signin-email').style.border = '1px solid red'
     }
   }
   const handleGoogleSignup = async () => {
@@ -111,7 +130,7 @@ const SignUp = () => {
           <ToggleButton onClick={switchToRegister}>Sign In</ToggleButton>
         </ButtonBox>
 
-        <Login loginFormLeft={loginFormLeft}>
+        <InputGroup style={{ left: loginFormLeft }}>
           <AuthButton type="submit" onClick={handleGoogleSignup}>
             <AuthLogoImg src={AuthLogoLinks[0].url} alt="Google" />
             Sign up with Google
@@ -131,6 +150,7 @@ const SignUp = () => {
           />
           <FormText>Email:</FormText>
           <Input
+            id="signup-email"
             type="email"
             placeholder="Enter your email"
             value={email}
@@ -138,15 +158,16 @@ const SignUp = () => {
           />
           <FormText>Password:</FormText>
           <Input
+            id="signup-password"
             type="password"
             placeholder="Enter your password"
             value={password}
             onChange={handlePasswordChange}
           />
           <SubmitButton onClick={handleSignUp}>Sign up</SubmitButton>
-        </Login>
+        </InputGroup>
 
-        <Register registerFormLeft={registerFormLeft}>
+        <InputGroup style={{ left: registerFormLeft }}>
           <AuthButton type="submit" onClick={handleGoogleSignup}>
             <AuthLogoImg src={AuthLogoLinks[0].url} alt="Google" />
             Sign in with Google
@@ -159,6 +180,7 @@ const SignUp = () => {
           <CenterText>Or</CenterText>
           <FormText>Email:</FormText>
           <Input
+            id="signin-email"
             type="email"
             placeholder="Enter your email"
             value={email}
@@ -166,13 +188,14 @@ const SignUp = () => {
           />
           <FormText>Password:</FormText>
           <Input
+            id="signin-password"
             type="password"
             placeholder="Enter your password"
             value={password}
             onChange={handlePasswordChange}
           />
-          <SubmitButton onClick={handleSignUp}>Sign in</SubmitButton>
-        </Register>
+          <SubmitButton onClick={handleSignIn}>Sign in</SubmitButton>
+        </InputGroup>
       </FormBox>
     </Hero>
   )
diff --git a/src/components/shared/GlobalButton.jsx b/src/components/shared/GlobalButton.jsx
index efd2353..90d4466 100644
--- a/src/components/shared/GlobalButton.jsx
+++ b/src/components/shared/GlobalButton.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import styled from 'styled-components'
 
-const ButtonCont = styled.button`
+const ButtonCont = styled.span`
   height: 52px;
   cursor: pointer;
   border: none;
diff --git a/src/context/AuthContext.js b/src/context/AuthContext.js
index 12cfd24..2d837ce 100644
--- a/src/context/AuthContext.js
+++ b/src/context/AuthContext.js
@@ -11,7 +11,7 @@ export const AuthProvider = ({ children }) => {
 
   useEffect(() => {
     const unsubscribe = onAuthStateChanged(auth, (user) => {
-      console.log('Auth State Changed:', user)
+      //console.log('Auth State Changed:', user)
       setCurrentUser(user)
     })
 
diff --git a/src/firebase/firebase.js b/src/firebase/firebase.js
index 5ac0699..d6ebce4 100644
--- a/src/firebase/firebase.js
+++ b/src/firebase/firebase.js
@@ -5,7 +5,6 @@ import { initializeApp } from 'firebase/app'
 import { getAuth } from 'firebase/auth'
 import { getDatabase } from 'firebase/database'
 
-//import firebaseConfig2 from '../../.env'
 const firebaseConfig = {
   apiKey: process.env.NEXT_PUBLIC_FIREBASE_API_KEY,
   authDomain: process.env.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN,
@@ -17,10 +16,6 @@ const firebaseConfig = {
   measurementId: process.env.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID
 }
 
-//console.log('Firebase Config:', firebaseConfig)
-// Initialize Firebase
 const app = initializeApp(firebaseConfig)
 export const auth = getAuth(app)
 export const database = getDatabase(app)
-//export const database = firebase.database();
-//export const googleAuthProvider = new firebase.auth.GoogleAuthProvider();
diff --git a/src/firebase/signupAuth.js b/src/firebase/signupAuth.js
index 1adcd6a..f22ea0a 100644
--- a/src/firebase/signupAuth.js
+++ b/src/firebase/signupAuth.js
@@ -1,5 +1,6 @@
 import {
   createUserWithEmailAndPassword,
+  signInWithEmailAndPassword,
   GithubAuthProvider,
   GoogleAuthProvider,
   signInWithPopup
@@ -16,11 +17,11 @@ export const signUpWithEmailAndPassword = async (email, password, name) => {
 
     // adding name to db
     const userRef = ref(database, `users/${user.uid}`)
+    console.log('adding name to db', user.uid)
     await set(userRef, {
       name: name,
       email: user.email
     })
-
     return user
   } catch (error) {
     //console.error('Error signing up:', error.message)
@@ -28,21 +29,30 @@ export const signUpWithEmailAndPassword = async (email, password, name) => {
   }
 }
 
+export const signInWithEmailAndPass = async (email, password) => {
+  try {
+    const userCredential = await signInWithEmailAndPassword(auth, email, password)
+    const user = userCredential.user
+
+    return user
+  } catch (error) {
+    throw error
+  }
+}
+
 // signup with google function
 export const signUpWithGoogle = async () => {
   try {
-    // Configure Google provider
     const provider = new GoogleAuthProvider()
 
     // Sign in with Google
     const userCredential = await signInWithPopup(auth, provider)
     const user = userCredential.user
 
-    // Check if user already exists in the database
     const userRef = ref(database, `users/${user.uid}`)
     const snapshot = await get(userRef)
 
-    // If user doesn't exist, add them to the database
+    // adding user to db in users/
     if (!snapshot.exists()) {
       await set(userRef, {
         name: user.displayName,
@@ -63,10 +73,8 @@ export const signUpWithGitHub = async () => {
 
   try {
     await signInWithPopup(auth, provider)
-    // Handle the successful sign-up
     //console.log('User signed up with GitHub:', result.user)
   } catch (error) {
-    // Handle errors
     //console.error('Error signing up with GitHub:', error.message)
   }
 }