diff --git a/frontend/src/components/login/createAccount.js b/frontend/src/components/login/createAccount.js
index d334060..535b093 100644
--- a/frontend/src/components/login/createAccount.js
+++ b/frontend/src/components/login/createAccount.js
@@ -66,6 +66,7 @@ export default function CreateAccount() {
     const [password, setPassword] = React.useState("");
     const [login, setLogin] = React.useState(true);
     const [status, setStatus] = React.useState(null);
+    const [statusText, setStatusText] = React.useState(null);
     const [button, setButton] = React.useState(false);
 
     const putCreateAccount = async (url, data) => {
@@ -81,6 +82,7 @@ export default function CreateAccount() {
             body: JSON.stringify(data)
         });
         setStatus(response.status)
+        setStatusText(response.statusText)
         if (response.status == "200") {
             setLogin(false)
         }
@@ -98,7 +100,7 @@ export default function CreateAccount() {
     }
 
     const handleKeyDown = (e) => {
-        if (e.keyCode == 13) {
+        if (e.key === "Enter") {
             if (username !== "" && password !== "") {
                 setButton(true)
                 putCreateAccount(url, { email: username, password: password })
@@ -177,7 +179,7 @@ export default function CreateAccount() {
                         </form>
                     </CardContent>
                 </Card>
-                <LoginFeedback login={status} successText="Account created successfully" errorText="Oops something went wrong"></LoginFeedback>
+                <LoginFeedback login={status} text={statusText}></LoginFeedback>
             </Box > : <Redirect to={"/login"} />
     )
 
diff --git a/frontend/src/components/login/login.js b/frontend/src/components/login/login.js
index 670916a..2981f38 100644
--- a/frontend/src/components/login/login.js
+++ b/frontend/src/components/login/login.js
@@ -69,6 +69,7 @@ export default function Login() {
     const [login, setLogin] = React.useState(true);
     const [status, setStatus] = React.useState(null);
     const [button, setButton] = React.useState(false);
+    const [statusText, setStatusText] = React.useState(null);
 
     const postLogin = async (url, data) => {
 
@@ -84,6 +85,7 @@ export default function Login() {
             body: JSON.stringify(data)
         });
         setStatus(response.status)
+        setStatusText(response.statusText)
         if (response.status == "200") {
             setLogin(false)
         }
@@ -103,7 +105,7 @@ export default function Login() {
     }
 
     const handleKeyDown = (e) => {
-        if (e.keyCode == 13) {
+        if (e.key === "Enter") {
             if (username !== "" && password !== "") {
                 setButton(true)
                 postLogin(url, { email: username, password: password })
@@ -194,7 +196,7 @@ export default function Login() {
                         </form>
                     </CardContent>
                 </Card>
-                <LoginFeedback login={status} successText="Login Successful" errorText="Wrong Username or Password"></LoginFeedback>
+                <LoginFeedback login={status} text={statusText}></LoginFeedback>
             </Box > : <Redirect to='/' />
     )
 
diff --git a/frontend/src/components/login/loginfeedback.js b/frontend/src/components/login/loginfeedback.js
index 2cd55b3..cecdfa5 100644
--- a/frontend/src/components/login/loginfeedback.js
+++ b/frontend/src/components/login/loginfeedback.js
@@ -35,14 +35,14 @@ export default function LoginFeedback(props) {
             setOutput(
                 <Snackbar open={open} autoHideDuration={2000} onClose={handleClose}>
                     <Alert onClose={handleClose} severity="success">
-                        {props.successText}
+                        {props.text}
                     </Alert>
                 </Snackbar>)
         } else if (login != null) {
             setOutput(
                 <Snackbar open={open1} autoHideDuration={3000} onClose={handleClose1}>
                     <Alert onClose={handleClose1} severity="error">
-                        {props.errorText}
+                        {props.text}
                     </Alert>
                 </Snackbar>
             )