diff --git a/src/App.tsx b/src/App.tsx
index 458470b04401c6a1593bef169628b611cd9916d9..9d9a8cf2fb268834f1755ec0703b0b474d02b9fc 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,8 +1,8 @@
 import React, { FC } from 'react';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
-import { HomePage } from './components/HomePage/HomePage';
-import { AuthUser } from './components/AuthUser/AuthUser';
-import { LandingPage } from './components/LandingPage/LandingPage';
+import { HomePage } from 'components/HomePage/HomePage';
+import { AuthUser } from 'components/AuthUser/AuthUser';
+import { LandingPage } from 'components/LandingPage/LandingPage';
 
 export const App: FC = () => (
   <Router>
diff --git a/src/components/AuthUser/SignInForm/InputField.tsx b/src/components/AuthUser/SignInForm/InputField.tsx
deleted file mode 100644
index a0093c9c7bacc5ab2a82c2a924b83e12100332f8..0000000000000000000000000000000000000000
--- a/src/components/AuthUser/SignInForm/InputField.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { FC } from 'react';
-import { TextField } from '@material-ui/core';
-import { Control, Controller, FieldValues } from 'react-hook-form';
-
-type Props = {
-  /**
-   * Name of the elemement. ex. email, password
-   */
-  name: string;
-  label: string;
-  error: boolean;
-  errorMessage: string;
-  /**
-   * react-hook-form control
-   */
-  control: Control<FieldValues> | undefined;
-  rules: Partial<unknown>;
-};
-
-export const InputField: FC<Props> = (props: Props) => {
-  const { name, label, error, errorMessage, control, rules } = props;
-  return (
-    <Controller
-      name={name}
-      control={control}
-      rules={rules}
-      render={({ onChange, value }) => (
-        <TextField
-          variant="outlined"
-          margin="normal"
-          required
-          fullWidth
-          id={name}
-          label={label}
-          name={name}
-          onChange={onChange}
-          value={value}
-          autoComplete={name}
-          autoFocus
-          error={error}
-          helperText={error && errorMessage}
-        />
-      )}
-    />
-  );
-};
diff --git a/src/components/AuthUser/SignInForm/SignInForm.tsx b/src/components/AuthUser/SignInForm/SignInForm.tsx
index 1de3d63935aab54bfdae5c3df2cff294b3577a29..9432ee95163cfc8cc887a381c3dbae84ef287d13 100644
--- a/src/components/AuthUser/SignInForm/SignInForm.tsx
+++ b/src/components/AuthUser/SignInForm/SignInForm.tsx
@@ -1,11 +1,10 @@
 import React, { FC } from 'react';
 import axios from 'axios';
 import { SubmitHandler, useForm } from 'react-hook-form';
-import { useIntl } from 'react-intl';
 import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import { Button } from '@material-ui/core';
 import { DevTool } from '@hookform/devtools';
-import { InputField } from './InputField';
+import { InputField } from 'components/AuthUser/SignInForm/InputField/InputField';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -54,7 +53,6 @@ export const SignInForm: FC = () => {
       },
     );
   };
-  const intl = useIntl();
   const classes = useStyles();
   return (
     <>
@@ -71,12 +69,12 @@ export const SignInForm: FC = () => {
               /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(value),
             required: {
               value: true,
-              message: intl.formatMessage({ id: 'email' }),
+              message: 'Email is not valid',
             },
           }}
-          label={intl.formatMessage({ id: 'email' })}
+          label="Email"
           error={!!errors.email}
-          errorMessage={intl.formatMessage({ id: 'email-error' })}
+          errorMessage="Insert email"
         />
 
         <InputField
@@ -87,20 +85,20 @@ export const SignInForm: FC = () => {
             maxLength: 60,
             required: {
               value: true,
-              message: intl.formatMessage({ id: 'password' }),
+              message: 'Insert valid password',
             },
           }}
-          label={intl.formatMessage({ id: 'password' })}
+          label="Password"
           error={!!errors.password}
-          errorMessage={intl.formatMessage({ id: 'password-error' })}
+          errorMessage="Insert valid password"
         />
 
         <Button
+          data-testid="Submit"
           type="submit"
           fullWidth
           variant="contained"
           color="primary"
-          data-testid="Submit"
           className={classes.submit}
         >
           Sign In
diff --git a/src/index.tsx b/src/index.tsx
index b298e0f5d1e4949517999145860a107de6f84edf..295b12325a3d7f53544b079f13cd9322206f054c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import CssBaseline from '@material-ui/core/CssBaseline';
-import { App } from './App';
+import { App } from 'App';
 
 ReactDOM.render(
   <React.StrictMode>