diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx
index 88bbb4f..227524d 100644
--- a/src/pages/LoginPage/Login.tsx
+++ b/src/pages/LoginPage/Login.tsx
@@ -40,8 +40,9 @@ export default () => {
     }
 
     if (dbpassword.result === hashPassword) {
-      _employeeId.set(employeeid)
+      _employeeId.set(employeeid.result)
       _employeeName.set(name())
+      saveEmployee()
       setLoggedin(2)
     } else {
       setLoggedin(1)
@@ -60,6 +61,20 @@ export default () => {
     navigate('/main')
   }
 
+  const gotoAssessor = () => {
+    navigate('/assessor')
+  }
+
+  const navigateToRolePage = () => {
+    if (role() === 'Assessor') gotoAssessor()
+    else gotoMain()
+  }
+
+  const saveEmployee = () => {
+    sessionStorage.setItem('id', _employeeId.get().toString())
+    sessionStorage.setItem('name', _employeeName.get())
+  }
+
   createEffect(() => {
     if (role() === 'Approver') setName(APPROVERNAME)
     else if (role() !== 'Approver' && name() === APPROVERNAME) setName('')
@@ -146,7 +161,7 @@ export default () => {
         </Padding>
       </Page>
 
-      <div onClick={gotoMain}>
+      <div onClick={navigateToRolePage}>
         <Modal trigger={loggedin() === 2} background="#123220ff" color="#cdfbe1f0" opacity={0.8}>
           <Padding top={1} bottom={1} left={4} right={4}>
             <Column>
diff --git a/src/pages/RegisterPage/Register.tsx b/src/pages/RegisterPage/Register.tsx
index 4612159..cb75280 100644
--- a/src/pages/RegisterPage/Register.tsx
+++ b/src/pages/RegisterPage/Register.tsx
@@ -161,7 +161,7 @@ export default () => {
 
           <Padding top={2} left={0} right={0} bottom={0}>
             <Row>
-              <Box curved thickness={2} padding="2rem" color="#2f465cd7" background="#04040654">
+              <Box curved thickness={2} padding="2.25rem" color="#2f465cd7" background="#04040660">
                 <Row>
                   <span class="box-title">Registration</span>
                 </Row>