diff --git a/blocks/eda-frontend/src/pages/Login.js b/blocks/eda-frontend/src/pages/Login.js
index f1aefedd..8b19f4b5 100644
--- a/blocks/eda-frontend/src/pages/Login.js
+++ b/blocks/eda-frontend/src/pages/Login.js
@@ -53,11 +53,16 @@ let url = ''
 
 export default function SignIn (props) {
   const classes = useStyles()
-  const errors = useSelector(state => state.auth.errors)
-
+  const authErrors = useSelector(state => state.auth.errors)
+  const [errors, setErrors] = useState(authErrors || '')
+  
   const dispatch = useDispatch()
   const homeURL = `${window.location.origin}/#/`
 
+  useEffect(() => {
+    setErrors(authErrors || '')
+  }, [authErrors])
+
   useEffect(() => {
     document.title = 'Login - ' + process.env.REACT_APP_NAME
     if (props.location.search !== '') {
@@ -115,9 +120,11 @@ export default function SignIn (props) {
         </Typography>
 
         {/* Display's error messages while logging in */}
-        <Typography variant='body1' align='center' style={{ marginTop: '10px' }} color='error'>
-          {errors}
-        </Typography>
+        {authErrors && (
+          <Typography variant='body1' align='center' style={{ marginTop: '10px' }} color='error'>
+            {errors}
+          </Typography>
+        )}
 
         <form className={classes.form} noValidate>
           <TextField
@@ -131,7 +138,7 @@ export default function SignIn (props) {
             autoComplete='email'
             value={username}
             onChange={e => setUsername(e.target.value)}
-            autoFocus
+            onFocus={() => setErrors('')}
           />
           <TextField
             variant='outlined'
@@ -149,7 +156,7 @@ export default function SignIn (props) {
                     onClick={handleClickShowPassword}
                     onMouseDown={handleMouseDownPassword}
                   >
-                    {showPassword ? <Visibility fontSize='small' /> : <VisibilityOff fontSize='small' />} {/* Handle password visibility */}
+                    {showPassword ? <Visibility fontSize='small' /> : <VisibilityOff fontSize='small' />}
                   </IconButton>
                 </InputAdornment>
               )
@@ -158,6 +165,7 @@ export default function SignIn (props) {
             id='password'
             value={password}
             onChange={e => setPassword(e.target.value)}
+            onFocus={() => setErrors('')}
             autoComplete='current-password'
           />
           <FormControlLabel
diff --git a/blocks/eda-frontend/src/pages/signUp.js b/blocks/eda-frontend/src/pages/signUp.js
index 40a25a87..e14268ac 100644
--- a/blocks/eda-frontend/src/pages/signUp.js
+++ b/blocks/eda-frontend/src/pages/signUp.js
@@ -52,10 +52,22 @@ export default function SignUp () {
 
   const isRegistered = useSelector(state => state.auth.isRegistered)
   const regErrors = useSelector(state => state.auth.regErrors)
+  const [errors, setErrors] = useState(regErrors || '')
+  const [isSignupSuccess, setIsSignupSuccess] = useState(false)
+
+  useEffect(() => {
+    if (isRegistered) {
+      setIsSignupSuccess(true)
+    }
+  }, [isRegistered])
 
   const dispatch = useDispatch()
   const homeURL = `${window.location.origin}/#/`
 
+  useEffect(() => {
+    setErrors(regErrors || '')
+  }, [regErrors])
+
   useEffect(() => {
     document.title = 'Sign Up - ' + process.env.REACT_APP_NAME
 
@@ -99,9 +111,11 @@ export default function SignUp () {
         </Typography>
 
         {/* Display's error messages while signing in */}
-        <Typography variant='body1' align='center' style={{ marginTop: '10px' }} color={isRegistered ? 'secondary' : 'error'}>
-          {regErrors}
-        </Typography>
+        {regErrors && (
+          <Typography variant='body1' align='center' style={{ marginTop: '10px' }} color={isRegistered ? 'secondary' : 'error'}>
+            {errors}
+          </Typography>
+        )}
 
         <form className={classes.form} noValidate>
           <TextField
@@ -116,7 +130,8 @@ export default function SignUp () {
             autoComplete='email'
             value={email}
             onChange={e => setEmail(e.target.value)}
-            autoFocus
+            onFocus={() => setErrors('')}
+            disabled={isSignupSuccess}
           />
           <TextField
             variant='outlined'
@@ -143,7 +158,9 @@ export default function SignUp () {
             id='password'
             value={password}
             onChange={e => setPassword(e.target.value)}
+            onFocus={() => setErrors('')}
             autoComplete='current-password'
+            disabled={isSignupSuccess}
           />
           <TextField
             variant='outlined'
@@ -170,10 +187,12 @@ export default function SignUp () {
             id='reenterPassword'
             value={reenterPassword}
             onChange={e => setReenterPassword(e.target.value)}
+            onFocus={() => setErrors('')}
             autoComplete='current-password'
+            disabled={isSignupSuccess}
           />
           <FormControlLabel
-            control={<Checkbox checked={accept} onChange={e => setAccept(e.target.checked)} color='primary' />}
+            control={<Checkbox checked={accept} onChange={e => setAccept(e.target.checked)} color='primary' disabled={isSignupSuccess} />}
             label='I accept the Terms of Use & Privacy Policy'
           />
           <Button