diff --git a/electron_app/src/clientManager.js b/electron_app/src/clientManager.js
index 30b400fc0..5066a8ec7 100644
--- a/electron_app/src/clientManager.js
+++ b/electron_app/src/clientManager.js
@@ -153,6 +153,11 @@ class ClientManager {
     return checkDeviceRemoved(res);
   }
 
+  async resetPassword(recipientId) {
+    const res = await client.resetPassword(recipientId);
+    return checkDeviceRemoved(res);
+  }
+
   async unlockDevice(params) {
     const res = await client.unlockDevice(params);
     return checkDeviceRemoved(res);
diff --git a/email_dialog/src/components/Dialog.js b/email_dialog/src/components/Dialog.js
index 90facd770..027f14612 100644
--- a/email_dialog/src/components/Dialog.js
+++ b/email_dialog/src/components/Dialog.js
@@ -3,27 +3,27 @@ import { remoteData, onResponseModal } from './../utils/electronInterface';
 import * as messages from './../utils/contents';
 import './dialog.css';
 
-const { title, contentType, options, sendTo } = remoteData;
+const { title, contentType, options, sendTo, customTextToReplace } = remoteData;
 
 const Dialog = () => (
   <div className="dialog-body">
     <div className="header" />
     <div className="content">
       <h2 className="title">{title}</h2>
-      {renderContent(contentType)}
+      {renderContent(customTextToReplace, contentType)}
       {renderOptions(options, sendTo)}
     </div>
   </div>
 );
 
-const renderContent = contentType => {
+const renderContent = (customText, contentType) => {
   switch (contentType) {
     case 'EMPTY_RECOVERY_EMAIL':
       return messages.EmptyRecoveryEmail();
-    case 'FORGOT_PASSWORD_SENT_LINK':
-      return messages.ForgotPasswordSentLink();
+    case 'FORGOT_PASSWORD_SEND_LINK':
+      return messages.ForgotPasswordSentLink(customText);
     case 'FORGOT_PASSWORD_EMPTY_EMAIL':
-      return messages.ForgotPasswordEmptyEmail();
+      return messages.ForgotPasswordEmptyEmail(customText);
     case 'PERMANENT_DELETE_THREAD':
       return messages.PermanentDeleteThread();
     default:
@@ -34,18 +34,22 @@ const renderContent = contentType => {
 const renderOptions = (options, sendTo) => {
   return (
     <div className="options">
-      <button
-        className={options.acceptLabel !== '' ? 'cancel' : 'hidden'}
-        onClick={e => onResponseModal(e, options.cancelLabel, sendTo)}
-      >
-        <span>{options.cancelLabel}</span>
-      </button>
-      <button
-        className={options.acceptLabel !== '' ? 'confirm' : 'hidden'}
-        onClick={e => onResponseModal(e, options.acceptLabel, sendTo)}
-      >
-        <span>{options.acceptLabel}</span>
-      </button>
+      {options.cancelLabel && (
+        <button
+          className="cancel"
+          onClick={e => onResponseModal(e, options.cancelLabel, sendTo)}
+        >
+          <span>{options.cancelLabel}</span>
+        </button>
+      )}
+      {options.acceptLabel && (
+        <button
+          className="confirm"
+          onClick={e => onResponseModal(e, options.acceptLabel, sendTo)}
+        >
+          <span>{options.acceptLabel}</span>
+        </button>
+      )}
     </div>
   );
 };
diff --git a/email_dialog/src/components/dialog.scss b/email_dialog/src/components/dialog.scss
index c7ec0090d..1f71c40dc 100644
--- a/email_dialog/src/components/dialog.scss
+++ b/email_dialog/src/components/dialog.scss
@@ -30,7 +30,7 @@
     }
 
     .message-empty-recovery-email {
-      font-size: 13px;
+      font-size: 13.5px;
       position: relative;
       top: 10px;
     }
@@ -40,7 +40,7 @@
       top: 15px;
     }
     .message-forgot-sent-link {
-      font-size: 14px;
+      font-size: 15px;
       position: relative;
       top: 20px;
       p {
@@ -62,6 +62,9 @@
       position: absolute;
       bottom: 30px;
       .cancel {
+        position: absolute;
+        left: 5px;
+        bottom: 0px;
         border: none;
         outline: none;
         border-radius: 100px;
@@ -77,6 +80,9 @@
         }
       }
       .confirm {
+        position: absolute;
+        left: 190px;
+        bottom: 0px;
         border: none;
         outline: none;
         border-radius: 100px;
diff --git a/email_dialog/src/utils/contents.js b/email_dialog/src/utils/contents.js
index 83bdd6706..646124575 100644
--- a/email_dialog/src/utils/contents.js
+++ b/email_dialog/src/utils/contents.js
@@ -9,26 +9,33 @@ export const LostAllDevices = () => (
   </div>
 );
 
-export const EmptyRecoveryEmail = () => (
-  <div className="message-empty-recovery-email">
-    <p>
-      You did not set a <strong>Recovery Email</strong> so account recovery is
-      impossible if you forget your password.
-    </p>
-    <p>Proceed without recovery email?</p>
-  </div>
-);
+export const EmptyRecoveryEmail = () => {
+  return (
+    <div className="message-empty-recovery-email">
+      <p>
+        You did not set a <strong>Recovery Email</strong> so account recovery is
+        impossible if you forget your password.
+      </p>
+    </div>
+  );
+};
 
-export const ForgotPasswordSentLink = () => (
-  <div className="message-forgot-sent-link">
-    <p>A reset link will be sent to d******@o****l.com</p>
-    <p>The link will be valid for 1 hour</p>
-  </div>
-);
+export const ForgotPasswordSentLink = customText => {
+  const content =
+    customText ||
+    `A reset link was sent to your Recovery email\nThe link will be valid for 30 min`;
+  return (
+    <div className="message-forgot-sent-link">
+      <p>{content}</p>
+    </div>
+  );
+};
 
-export const ForgotPasswordEmptyEmail = () => (
+export const ForgotPasswordEmptyEmail = customText => (
   <div className="message-forgot-empty-email">
-    <p>You need to set a Recovery Email to reset your password.</p>
+    <p>
+      {customText || `You need to set a Recovery Email to reset your password`}
+    </p>
   </div>
 );
 
diff --git a/email_login/src/components/Login.js b/email_login/src/components/Login.js
index c247d296f..ad6a3eb8b 100644
--- a/email_login/src/components/Login.js
+++ b/email_login/src/components/Login.js
@@ -27,21 +27,18 @@ const renderForm = props => (
   <div className="form">
     <form autoComplete="off">
       <div className="label">
-        <label>
-          <input
-            type="text"
-            name="username"
-            placeholder="Username"
-            value={props.value}
-            onChange={props.onChangeField}
-            onKeyUp={props.validator}
-            autoFocus={true}
-          />
-          &nbsp;
-          <span>@criptext.com</span>
-          <div className="clear" />
-        </label>
+        <input
+          type="text"
+          name="username"
+          placeholder="Username"
+          value={props.value}
+          onChange={props.onChangeField}
+          autoFocus={true}
+        />
+        &nbsp;
+        <span>@criptext.com</span>
       </div>
+      <span className="error-message">{props.errorMessage}</span>
       <div className="button">
         <button
           className="button-login"
@@ -67,10 +64,10 @@ const renderFooter = props => (
 );
 
 renderForm.propTypes = {
+  disabled: PropTypes.bool,
+  errorMessage: PropTypes.string,
   onChangeField: PropTypes.func,
-  validator: PropTypes.func,
   onClickSignIn: PropTypes.func,
-  disabled: PropTypes.bool,
   value: PropTypes.string
 };
 
diff --git a/email_login/src/components/LoginWrapper.js b/email_login/src/components/LoginWrapper.js
index 43e8f950f..0c97b3184 100644
--- a/email_login/src/components/LoginWrapper.js
+++ b/email_login/src/components/LoginWrapper.js
@@ -4,7 +4,10 @@ import SignUpWrapper from './SignUpWrapper';
 import LostAllDevicesWrapper from './LostAllDevicesWrapper';
 import ContinueLogin from './ContinueLogin';
 import { closeDialog, confirmLostDevices } from './../utils/electronInterface';
-import { validateUsername } from './../validators/validators';
+import {
+  validateUsername,
+  checkUsernameAvailable
+} from './../validators/validators';
 
 const mode = {
   SIGNUP: 'SIGNUP',
@@ -13,6 +16,10 @@ const mode = {
   LOST_DEVICES: 'LOST_DEVICES'
 };
 
+const errorMessages = {
+  USERNAME_NOT_EXISTS: "Username doesn't exists"
+};
+
 class LoginWrapper extends Component {
   constructor() {
     super();
@@ -21,13 +28,14 @@ class LoginWrapper extends Component {
       values: {
         username: ''
       },
-      disabled: true
+      disabled: true,
+      errorMessage: ''
     };
     this.timeCountdown = 0;
   }
 
-  componentDidMount() {
-    this.checkDisable();
+  async componentDidMount() {
+    await this.checkDisable();
   }
 
   render() {
@@ -55,9 +63,9 @@ class LoginWrapper extends Component {
             onClickSignIn={this.handleClickSignIn}
             onChangeField={this.handleChange}
             disabled={this.state.disabled}
-            validator={this.validateUsername}
             value={this.state.values.username}
             handleLostDevices={this.handleLostDevices}
+            errorMessage={this.state.errorMessage}
           />
         );
     }
@@ -66,42 +74,47 @@ class LoginWrapper extends Component {
   toggleSignUp = ev => {
     ev.preventDefault();
     ev.stopPropagation();
-    this.setState({
-      mode: this.state.mode === mode.LOGIN ? mode.SIGNUP : mode.LOGIN
+    const nextMode = this.state.mode === mode.LOGIN ? mode.SIGNUP : mode.LOGIN;
+    this.setState({ mode: nextMode }, async () => {
+      await this.checkDisable();
     });
-    this.checkDisable();
   };
 
   toggleContinue = ev => {
     ev.preventDefault();
     ev.stopPropagation();
     this.stopCountdown();
-    this.setState({
-      mode: this.state.mode === mode.LOGIN ? mode.CONTINUE : mode.LOGIN
+    const nextMode =
+      this.state.mode === mode.LOGIN ? mode.CONTINUE : mode.LOGIN;
+    this.setState({ mode: nextMode }, async () => {
+      await this.checkDisable();
     });
-    this.checkDisable();
   };
 
   toggleLostAllDevices = ev => {
     ev.preventDefault();
     ev.stopPropagation();
-    this.setState({
-      mode: mode.LOGIN
-    });
-    this.checkDisable();
+    this.setState(
+      {
+        mode: mode.LOGIN
+      },
+      async () => {
+        await this.checkDisable();
+      }
+    );
   };
 
   stopCountdown = () => {
     clearTimeout(this.timeCountdown);
   };
 
-  validateUsername = () => {
+  validateUsername = async () => {
     const username = this.state.values['username'];
-    return validateUsername(username);
+    return await validateUsername(username);
   };
 
-  checkDisable = () => {
-    const isValid = this.validateUsername();
+  checkDisable = async () => {
+    const isValid = await this.validateUsername();
     this.setState({
       disabled: !isValid
     });
@@ -110,17 +123,26 @@ class LoginWrapper extends Component {
   handleChange = event => {
     const values = { ...this.state.values };
     values[event.target.name] = event.target.value;
-    this.setState({ values }, () => {
-      this.checkDisable();
+    this.setState({ values, errorMessage: '' }, async () => {
+      await this.checkDisable();
     });
   };
 
-  handleClickSignIn = event => {
-    event.preventDefault();
-    event.stopPropagation();
-    this.setState({
-      mode: mode.LOST_DEVICES
-    });
+  handleClickSignIn = async ev => {
+    ev.preventDefault();
+    ev.stopPropagation();
+    const isAvailable = await checkUsernameAvailable(
+      this.state.values.username
+    );
+    if (isAvailable) {
+      this.setState({
+        errorMessage: errorMessages.USERNAME_NOT_EXISTS
+      });
+    } else {
+      this.setState({
+        mode: mode.LOST_DEVICES
+      });
+    }
   };
 
   handleLostDevices = event => {
diff --git a/email_login/src/components/LostAllDevices.js b/email_login/src/components/LostAllDevices.js
index ac8fc1ba1..373069ea3 100644
--- a/email_login/src/components/LostAllDevices.js
+++ b/email_login/src/components/LostAllDevices.js
@@ -49,7 +49,6 @@ const renderForm = props => (
           placeholder="Password"
           value={props.values.password}
           onChange={props.onChangeField}
-          onKeyUp={props.validator}
           disabled={props.isLoading}
           autoFocus={true}
         />
diff --git a/email_login/src/components/LostAllDevicesWrapper.js b/email_login/src/components/LostAllDevicesWrapper.js
index 7ba27517e..b68dc6d4a 100644
--- a/email_login/src/components/LostAllDevicesWrapper.js
+++ b/email_login/src/components/LostAllDevicesWrapper.js
@@ -11,10 +11,12 @@ import {
   login,
   openMailbox,
   throwError,
-  errors
+  errors,
+  resetPassword
 } from './../utils/electronInterface';
 import signal from './../libs/signal';
 import { hashPassword } from '../utils/HashUtils';
+import { censureEmailAddress } from '../utils/StringUtils';
 
 class LostDevicesWrapper extends Component {
   constructor(props) {
@@ -25,7 +27,6 @@ class LostDevicesWrapper extends Component {
         password: ''
       },
       disabled: true,
-      hasRecoveryEmail: true,
       isLoading: false
     };
   }
@@ -100,17 +101,20 @@ class LostDevicesWrapper extends Component {
     }
   };
 
-  handleForgot = event => {
-    event.preventDefault();
-    event.stopPropagation();
-    if (this.state.hasRecoveryEmail === true) {
-      confirmForgotPasswordSentLink(response => {
+  handleForgot = async ev => {
+    ev.preventDefault();
+    ev.stopPropagation();
+    const recipientId = this.state.values.username;
+    const { status, text } = await resetPassword(recipientId);
+    const customText = this.getForgotPasswordMessage(status, text);
+    if (status === 200) {
+      confirmForgotPasswordSentLink(customText, response => {
         if (response) {
           closeDialog();
         }
       });
     } else {
-      confirmForgotPasswordEmptyEmail(response => {
+      confirmForgotPasswordEmptyEmail(customText, response => {
         if (response) {
           closeDialog();
         }
@@ -118,6 +122,16 @@ class LostDevicesWrapper extends Component {
     }
   };
 
+  getForgotPasswordMessage = (status, text) => {
+    if (status === 200) {
+      const { address } = JSON.parse(text);
+      return `A reset link was sent to ${censureEmailAddress(
+        address
+      )}\nThe link will be valid for 30 minutes`;
+    }
+    return text;
+  };
+
   createAccountWithNewDevice = async ({ recipientId, deviceId, name }) => {
     try {
       await signal.createAccountWithNewDevice({
diff --git a/email_login/src/components/login.scss b/email_login/src/components/login.scss
index 6705fdd54..5b827a296 100644
--- a/email_login/src/components/login.scss
+++ b/email_login/src/components/login.scss
@@ -43,50 +43,51 @@
         width: 100%;
         margin: 0px;
         padding: 0px;
+        display: flex;
 
-        label {
-          input {
-            background: transparent;
-            width: 55%;
-            border: 0px;
-            border-bottom: solid 1px rgba(255,255,255,0.19);
-            color: #ffffff;
-            font-size: 13px;
-            font-weight: 300;
-            text-indent: 7px;
-            float: left;
-          }
-          input::placeholder {
+        input {
+          background: transparent;
+          width: 55%;
+          border: 0px;
+          border-bottom: solid 1px rgba(255,255,255,0.19);
+          color: #ffffff;
+          font-size: 13px;
+          font-weight: 300;
+          text-indent: 7px;
+
+          &::placeholder {
             color: rgba(255,255,255,0.6);
             opacity: 1;
           }
-          input:-ms-input-placeholder {
-            color: rgba(255,255,255,0.6);
-          }
-          input::-ms-input-placeholder {
-            color: rgba(255,255,255,0.6);
-          }
-          input:focus{
+
+          &:focus {
             outline: none;
             border-bottom: solid 1px #fff;
           }
-          span {
-            width: 40%;
-            float: right;
-            font-size: 14px;
-            font-weight: 300;
-            color: #ffffff;
-          }
-          .clear {
-            clear: both;
-          }
+        }
+        span {
+          width: 40%;
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
         }
       }
 
+      .error-message {
+        font-size: 12px;
+        color: #000;
+        position: relative;
+        left: 7px;
+      }
+
       .button {
-        width: 100%;
+        width: 60%;
         margin: 5% 0% 0% 0%;
         padding: 0px;
+        position: absolute;
+        bottom: 22%;
+
+
         .button-login {
           border: none;
           border-radius: 100px;
@@ -97,6 +98,7 @@
           width: 100%;
           transition: opacity 0.1s;
           outline: none;
+          
           span {
             color: #fff;
             font-weight: 600;
@@ -123,16 +125,17 @@
     height: 20%;
     color: #ffffff;
     font-size: 13px;
+
     .signup-message {
       position: relative;
-      top: -8%;
+      top: 8%;
       text-align: center;
+
       span{
         font-weight: 300;
         strong{
           cursor: pointer;
         }
-        
       }
     }
   }
diff --git a/email_login/src/components/lostAllDevices.scss b/email_login/src/components/lostAllDevices.scss
index 3772c3fae..2f9d7231b 100644
--- a/email_login/src/components/lostAllDevices.scss
+++ b/email_login/src/components/lostAllDevices.scss
@@ -128,7 +128,7 @@
         .button-lost {
           border: none;
           border-radius: 100px;
-          padding: 8.5px;
+          padding: 10px;
           background-color: #373a45;
           opacity: 0.5;
           margin: 15px 0;
diff --git a/email_login/src/utils/StringUtils.js b/email_login/src/utils/StringUtils.js
new file mode 100644
index 000000000..70126c2f0
--- /dev/null
+++ b/email_login/src/utils/StringUtils.js
@@ -0,0 +1,36 @@
+export const censureEmailAddress = address => {
+  const [user, domain] = address.split('@');
+  const domainLevels = domain.split('.');
+  const lastLevel = domainLevels.pop();
+  const character = '*';
+  const censoredUser = replaceCharacters(user, [0], character);
+  const censoredDomain = `${replaceCharacters(
+    domainLevels.join('.'),
+    [0, -1],
+    character
+  )}.${lastLevel}`;
+  return `${censoredUser}@${censoredDomain}`;
+};
+
+export const replaceCharacters = (string, positionsToExclude, character) => {
+  if (typeof positionsToExclude === 'string') {
+    return positionsToExclude === 'all'
+      ? string
+      : positionsToExclude === 'none'
+        ? character.repeat(string.length)
+        : string;
+  }
+  if (Array.isArray(positionsToExclude)) {
+    const sanitizedPositions = positionsToExclude.map(position => {
+      return position < 0 ? string.length + position : position;
+    });
+    let replacedString = '';
+    for (let i = 0; i < string.length; i++) {
+      const newCharacter = sanitizedPositions.includes(i)
+        ? string.charAt(i)
+        : character;
+      replacedString += newCharacter;
+    }
+    return replacedString;
+  }
+};
diff --git a/email_login/src/utils/__tests__/StringUtils.js b/email_login/src/utils/__tests__/StringUtils.js
new file mode 100644
index 000000000..286e8df10
--- /dev/null
+++ b/email_login/src/utils/__tests__/StringUtils.js
@@ -0,0 +1,41 @@
+/* eslint-env node, jest */
+
+import { censureEmailAddress, replaceCharacters } from './../StringUtils';
+
+describe('Censure email address: ', () => {
+  it('Should censure all email address', () => {
+    const email = 'testemail@another.domain.level.com';
+    const expected = 't********@a******************l.com';
+    const censoredEmail = censureEmailAddress(email);
+    expect(censoredEmail).toEqual(expected);
+  });
+});
+
+describe('Replace characters in string ', () => {
+  it('Should replace all string. Param type: String', () => {
+    const initialString = 'thisisarandomstringtoreplace';
+    const expectedString = '****************************';
+    const exclude = 'none';
+    const character = '*';
+    const replacedString = replaceCharacters(initialString, exclude, character);
+    expect(replacedString).toEqual(expectedString);
+  });
+
+  it('Should not replace string. Param type: String', () => {
+    const initialString = 'thisisarandomstringtoreplace';
+    const expectedString = 'thisisarandomstringtoreplace';
+    const exclude = 'all';
+    const character = '*';
+    const replacedString = replaceCharacters(initialString, exclude, character);
+    expect(replacedString).toEqual(expectedString);
+  });
+
+  it('Should replace some positions in string. Param type: Array', () => {
+    const initialString = 'thisisarandomstringtoreplace';
+    const expectedString = 't**************************e';
+    const exclude = [0, -1];
+    const character = '*';
+    const replacedString = replaceCharacters(initialString, exclude, character);
+    expect(replacedString).toEqual(expectedString);
+  });
+});
diff --git a/email_login/src/utils/electronInterface.js b/email_login/src/utils/electronInterface.js
index 00acbcc50..925034b2b 100644
--- a/email_login/src/utils/electronInterface.js
+++ b/email_login/src/utils/electronInterface.js
@@ -1,5 +1,5 @@
 const electron = window.require('electron');
-const { ipcRenderer, remote } = electron;
+const { ipcRenderer, remote, webFrame } = electron;
 const dbManager = remote.require('./src/DBManager');
 const clientManager = remote.require('./src/clientManager');
 export const { requiredMinLength, requiredMaxLength } = remote.require(
@@ -9,8 +9,11 @@ export const errors = remote.require('./src/errors');
 export const myAccount = remote.require('./src/Account');
 export const LabelType = remote.require('./src/systemLabels');
 
+webFrame.setVisualZoomLevelLimits(1, 1);
+webFrame.setLayoutZoomLevelLimits(0, 0);
+
 /* Window events
-   ----------------------------- */
+  ----------------------------- */
 export const closeDialog = () => {
   ipcRenderer.send('close-modal');
 };
@@ -55,10 +58,11 @@ export const confirmLostDevices = callback => {
   });
 };
 
-export const confirmForgotPasswordEmptyEmail = callback => {
+export const confirmForgotPasswordEmptyEmail = (customText, callback) => {
   const dataForModal = {
     title: 'Alert!',
     contentType: 'FORGOT_PASSWORD_EMPTY_EMAIL',
+    customTextToReplace: customText,
     options: {
       cancelLabel: 'Cancel',
       acceptLabel: 'Ok'
@@ -71,12 +75,12 @@ export const confirmForgotPasswordEmptyEmail = callback => {
   });
 };
 
-export const confirmForgotPasswordSentLink = callback => {
+export const confirmForgotPasswordSentLink = (customText, callback) => {
   const dataForModal = {
-    title: 'Forgot Password?',
-    contentType: 'FORGOT_PASSWORD_SENT_LINK',
+    title: 'Forgot Password',
+    contentType: 'FORGOT_PASSWORD_SEND_LINK',
+    customTextToReplace: customText,
     options: {
-      cancelLabel: 'Cancel',
       acceptLabel: 'Ok'
     },
     sendTo: 'login'
@@ -108,7 +112,7 @@ export const throwError = error => {
 };
 
 /* Criptext Client
-   ----------------------------- */
+  ----------------------------- */
 export const checkAvailableUsername = username => {
   return clientManager.checkAvailableUsername(username);
 };
@@ -125,8 +129,12 @@ export const postUser = params => {
   return clientManager.postUser(params);
 };
 
+export const resetPassword = recipientId => {
+  return clientManager.resetPassword(recipientId);
+};
+
 /* DataBase
-   ----------------------------- */
+  ----------------------------- */
 export const cleanDataBase = params => {
   return dbManager.cleanDataBase(params);
 };