diff --git a/frontend/src/components/TicketListItem/index.js b/frontend/src/components/TicketListItem/index.js
index 58bab3e..a4a0fd1 100644
--- a/frontend/src/components/TicketListItem/index.js
+++ b/frontend/src/components/TicketListItem/index.js
@@ -102,12 +102,12 @@ const useStyles = makeStyles(theme => ({
 
 	userTag: {
 		position: "absolute",
-		marginRight: 35,
-		right: 10,
-		bottom: 9,
-		background:"#2576D2",
+		marginRight: 5,
+		right: 5,
+		bottom: 5,
+		background: "#2576D2",
 		color: "#ffffff",
-		border:"1px solid #CCC",
+		border: "1px solid #CCC",
 		padding: 1,
 		paddingLeft: 5,
 		paddingRight: 5,
@@ -211,8 +211,8 @@ const TicketListItem = ({ ticket }) => {
 									)}
 								</Typography>
 							)}
-							{ticket?.whatsapp && (
-								<div className={classes.userTag} title={i18n.t("ticketsList.connectionTitle")}>{ticket.whatsapp.name}</div>
+							{ticket.whatsappId && (
+								<div className={classes.userTag} title={i18n.t("ticketsList.connectionTitle")}>{ticket.whatsapp?.name}</div>
 							)}
 						</span>
 					}
diff --git a/frontend/src/pages/Signup/index.js b/frontend/src/pages/Signup/index.js
index 0d36827..e71ef73 100644
--- a/frontend/src/pages/Signup/index.js
+++ b/frontend/src/pages/Signup/index.js
@@ -18,10 +18,10 @@ import {
 	InputAdornment,
 	IconButton,
 	Link
-  } from '@material-ui/core';
-  
+} from '@material-ui/core';
+
 import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons';
-  
+
 import { makeStyles } from "@material-ui/core/styles";
 
 import { i18n } from "../../translate/i18n";
@@ -155,16 +155,16 @@ const SignUp = () => {
 										label={i18n.t("signup.form.password")}
 										type={showPassword ? 'text' : 'password'}
 										InputProps={{
-										endAdornment: (
-											<InputAdornment position="end">
-											<IconButton
-												aria-label="toggle password visibility"
-												onClick={() => setShowPassword((e) => !e)}
-											>
-												{showPassword ? <VisibilityOff /> : <Visibility />}
-											</IconButton>
-											</InputAdornment>
-										)
+											endAdornment: (
+												<InputAdornment position="end">
+													<IconButton
+														aria-label="toggle password visibility"
+														onClick={() => setShowPassword((e) => !e)}
+													>
+														{showPassword ? <VisibilityOff /> : <Visibility />}
+													</IconButton>
+												</InputAdornment>
+											)
 										}}
 									/>
 								</Grid>
@@ -178,7 +178,7 @@ const SignUp = () => {
 							>
 								{i18n.t("signup.buttons.submit")}
 							</Button>
-							<Grid container justify="flex-end">
+							<Grid container justifyContent="flex-end">
 								<Grid item>
 									<Link
 										href="#"