diff --git a/client/coral-i18n/locales/en.yml b/client/coral-i18n/locales/en.yml
index 1fd205b88..7abbb5417 100644
--- a/client/coral-i18n/locales/en.yml
+++ b/client/coral-i18n/locales/en.yml
@@ -237,7 +237,34 @@ settings:
   sign_in: "Sign in"
   to_access: "to access Profile"
   user_no_comment: "You've never left a comment. Join the conversation!"
-sign_in: "Sign in"
+sign_in:
+  email_verify_cta: "Please verify your email address."
+  request_new_verify_email: "Request another email:"
+  verify_email: "Thank you for creating an account! We sent an email to the address you provided to verify your account."
+  verify_email2: "You must verify your account before engaging with the community."
+  not_you: "Not you?"
+  logged_in_as: "Logged in as"
+  facebook_sign_in: "Sign in with Facebook"
+  facebook_sign_up: "Sign up with Facebook"
+  logout: "Logout"
+  sign_in: "Sign in to join the conversation"
+  or: "Or"
+  email: "E-mail Address"
+  password: "Password"
+  forgot_your_pass: "Forgot your password?"
+  need_an_account: "Need an account?"
+  register: "Register"
+  sign_up: "Sign Up"
+  confirm_password: "Confirm Password"
+  username: "Username"
+  already_have_an_account: "Already have an account?"
+  recover_password: "Recover password"
+  email_in_use: "Email address already in use"
+  email_or_username_in_use: "Email address or Username already in use"
+  required_field: "This field is required"
+  passwords_dont_match: "Passwords don't match."
+  special_characters: "Usernames can contain letters, numbers and _ only"
+  check_the_form: "Invalid Form. Please, check the fields"
 step_1_header: "Report an issue"
 step_2_header: "Help us understand"
 step_3_header: "Thank you for your input"
diff --git a/client/coral-i18n/locales/es.yml b/client/coral-i18n/locales/es.yml
index 8a3c155fe..6d963cbfe 100644
--- a/client/coral-i18n/locales/es.yml
+++ b/client/coral-i18n/locales/es.yml
@@ -237,7 +237,34 @@ settings:
   sign_in: Entrar
   to_access: para acceder a al perfil
   user_no_comment: No has dejado aún ningún comentario. ¡Únete a la conversación!
-sign_in: Entrar
+sign_in:
+  email_verify_cta: "Por favor verifique su correo."
+  request_new_verify_email: "Enviar otro correo:"
+  verify_email: "¡Gracias por crear una cuenta! Le enviamos un correo a la dirección que dio para verificar su cuenta."
+  verify_email2: "Debe verificarla antes de poder involucrarse en la comunidad."
+  not_you: "¿No eres tu?"
+  logged_in_as: "Entraste como"
+  facebook_sign_in: "Acceder con Facebook"
+  facebook_sign_up: "Registrarse con Facebook"
+  logout: "Salir"
+  sign_in: "Entrar para unirte a la conversación"
+  or: "O"
+  email: "Correo"
+  password: "Contraseña"
+  forgot_your_pass: "¿Has olvidado tu contraseña?"
+  need_an_account: "¿Necesitas una cuenta?"
+  register: "Registrar"
+  sign_up: "Registro"
+  confirm_password: "Confirmar Contraseña"
+  username: "Nombre"
+  already_have_an_account: "¿Ya tienes una cuenta?"
+  recover_password: "Recuperar contraseña"
+  email_in_use: "Este correo se encuentra en uso"
+  email_or_username_in_use: "Este correo ó nombre de usuario se encuentran en uso"
+  required_field: "Este campo es necesario"
+  passwords_dont_match: "Las contraseñas no coinciden."
+  special_characters: "Los nombres pueden contener letras, números y _"
+  check_the_form: "Formulario Inválido. Por favor, completa los campos"
 step_1_header: Reportar un problema
 step_2_header: Ayudanos a comprender
 step_3_header: Gracias por tu participación
diff --git a/client/coral-sign-in/components/ForgotContent.js b/client/coral-sign-in/components/ForgotContent.js
index 578a5b1db..6039e5852 100644
--- a/client/coral-sign-in/components/ForgotContent.js
+++ b/client/coral-sign-in/components/ForgotContent.js
@@ -23,7 +23,7 @@ class ForgotContent extends React.Component {
     return (
       <div>
         <div className={styles.header}>
-          <h1>{lang.t('signIn.recoverPassword')}</h1>
+          <h1>{lang.t('signIn.recover_password')}</h1>
         </div>
         <form onSubmit={this.handleSubmit}>
           <div className={styles.textField}>
@@ -36,7 +36,7 @@ class ForgotContent extends React.Component {
               name="email" />
           </div>
           <Button type="submit" cStyle="black" className={styles.signInButton} full>
-            {lang.t('signIn.recoverPassword')}
+            {lang.t('signIn.recover_password')}
           </Button>
           {
             passwordRequestSuccess
@@ -50,8 +50,8 @@ class ForgotContent extends React.Component {
           }
         </form>
         <div className={styles.footer}>
-          <span>{lang.t('signIn.needAnAccount')} <a onClick={() => changeView('SIGNUP')}>{lang.t('signIn.register')}</a></span>
-          <span>{lang.t('signIn.alreadyHaveAnAccount')} <a onClick={() => changeView('SIGNIN')}>{lang.t('signIn.signIn')}</a></span>
+          <span>{lang.t('signIn.need_an_account')} <a onClick={() => changeView('SIGNUP')}>{lang.t('signIn.register')}</a></span>
+          <span>{lang.t('signIn.already_have_an_account')} <a onClick={() => changeView('SIGNIN')}>{lang.t('signIn.signIn')}</a></span>
         </div>
       </div>
     );
diff --git a/client/coral-sign-in/components/SignInContent.js b/client/coral-sign-in/components/SignInContent.js
index e536a1828..bf68b5255 100644
--- a/client/coral-sign-in/components/SignInContent.js
+++ b/client/coral-sign-in/components/SignInContent.js
@@ -23,14 +23,14 @@ const SignInContent = ({
     <div className="coral-sign-in">
       <div className={`${styles.header} header`}>
         <h1>
-          {auth.emailVerificationFailure ? lang.t('signIn.emailVerifyCTA') : lang.t('signIn.signIn')}
+          {auth.emailVerificationFailure ? lang.t('signIn.email_verify_cta') : lang.t('signIn.signIn')}
         </h1>
       </div>
       { auth.error && <Alert>{auth.error}</Alert> }
       {
         auth.emailVerificationFailure
         ? <form onSubmit={handleResendVerification}>
-            <p>{lang.t('signIn.requestNewVerifyEmail')}</p>
+            <p>{lang.t('signIn.request_new_verify_email')}</p>
             <TextField
               id="confirm-email"
               type="email"
@@ -44,7 +44,7 @@ const SignInContent = ({
         : <div>
             <div className={`${styles.socialConnections} social-connections`}>
               <Button cStyle="facebook" onClick={fetchSignInFacebook} full>
-                {lang.t('signIn.facebookSignIn')}
+                {lang.t('signIn.facebook_sign_in')}
               </Button>
             </div>
             <div className={styles.separator}>
@@ -83,9 +83,9 @@ const SignInContent = ({
           </div>
       }
       <div className={`${styles.footer} footer`}>
-        <span><a onClick={() => changeView('FORGOT')}>{lang.t('signIn.forgotYourPass')}</a></span>
+        <span><a onClick={() => changeView('FORGOT')}>{lang.t('signIn.forgot_your_pass')}</a></span>
         <span>
-          {lang.t('signIn.needAnAccount')}
+          {lang.t('signIn.need_an_account')}
           <a onClick={() => changeView('SIGNUP')} id='coralRegister'>
             {lang.t('signIn.register')}
           </a>
diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js
index e5a4cfb69..ba99cab97 100644
--- a/client/coral-sign-in/components/SignUpContent.js
+++ b/client/coral-sign-in/components/SignUpContent.js
@@ -60,7 +60,7 @@ class SignUpContent extends React.Component {
       <div>
         <div className={styles.header}>
           <h1>
-            {lang.t('signIn.signUp')}
+            {lang.t('signIn.sign_up')}
           </h1>
         </div>
 
@@ -69,7 +69,7 @@ class SignUpContent extends React.Component {
           <div>
             <div className={styles.socialConnections}>
               <Button cStyle="facebook" onClick={fetchSignUpFacebook} full>
-                {lang.t('signIn.facebookSignUp')}
+                {lang.t('signIn.facebook_sign_up')}
               </Button>
             </div>
             <div className={styles.separator}>
@@ -113,7 +113,7 @@ class SignUpContent extends React.Component {
               <TextField
                 id="confirmPassword"
                 type="password"
-                label={lang.t('signIn.confirmPassword')}
+                label={lang.t('signIn.confirm_password')}
                 value={formData.confirmPassword}
                 style={{fontSize: 16}}
                 showErrors={showErrors}
@@ -123,7 +123,7 @@ class SignUpContent extends React.Component {
               />
               <div className={styles.action}>
                 <Button type="submit" cStyle="black" id='coralSignUpButton' className={styles.signInButton} full>
-                  {lang.t('signIn.signUp')}
+                  {lang.t('signIn.sign_up')}
                 </Button>
                 { auth.isLoading && <Spinner /> }
               </div>
@@ -136,12 +136,12 @@ class SignUpContent extends React.Component {
             <Success />
             {
               emailVerificationEnabled &&
-              <p>{lang.t('signIn.verifyEmail')}<br /><br />{lang.t('signIn.verifyEmail2')}</p>
+              <p>{lang.t('signIn.verify_email')}<br /><br />{lang.t('signIn.verify_email2')}</p>
             }
           </div>
         }
         <div className={styles.footer}>
-          {lang.t('signIn.alreadyHaveAnAccount')} <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
+          {lang.t('signIn.already_have_an_account')} <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
             {lang.t('signIn.signIn')}
           </a>
         </div>
diff --git a/client/coral-sign-in/components/UserBox.js b/client/coral-sign-in/components/UserBox.js
index 88bd41dab..22e72e9c5 100644
--- a/client/coral-sign-in/components/UserBox.js
+++ b/client/coral-sign-in/components/UserBox.js
@@ -6,9 +6,9 @@ const lang = new I18n();
 
 const UserBox = ({className, user, onLogout, onShowProfile}) => (
   <div className={`${styles.userBox} ${className ? className : ''}`}>
-    {lang.t('signIn.loggedInAs')}
-    <a onClick={onShowProfile}>{user.username}</a>. {lang.t('signIn.notYou')}
-    <a className={styles.logout} onClick={onLogout} id='logout'>{lang.t('signIn.logout')}</a>
+    {lang.t('sign_in.logged_in_as')}
+    <a onClick={onShowProfile}>{user.username}</a>. {lang.t('sign_in.not_you')}
+    <a className={styles.logout} onClick={onLogout} id='logout'>{lang.t('sign_in.logout')}</a>
   </div>
 );
 
diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js
index 4912193c8..21ff25b3c 100644
--- a/client/coral-sign-in/containers/SignInContainer.js
+++ b/client/coral-sign-in/containers/SignInContainer.js
@@ -59,7 +59,7 @@ class SignInContainer extends Component {
     window.authCallback = this.props.facebookCallback;
     const {formData} = this.state;
     const errors = Object.keys(formData).reduce((map, prop) => {
-      map[prop] = lang.t('signIn.requiredField');
+      map[prop] = lang.t('signIn.required_field');
       return map;
     }, {});
     this.setState({errors});
@@ -109,9 +109,9 @@ class SignInContainer extends Component {
     const {formData} = this.state;
 
     if (!value.length) {
-      addError(name, lang.t('signIn.requiredField'));
+      addError(name, lang.t('signIn.required_field'));
     } else if (name === 'confirmPassword' && formData.confirmPassword !== formData.password) {
-      addError('confirmPassword', lang.t('signIn.passwordsDontMatch'));
+      addError('confirmPassword', lang.t('signIn.passwords_dont_match'));
     } else if (!validate[name](value)) {
       addError(name, errorMsj[name]);
     } else {
@@ -139,7 +139,7 @@ class SignInContainer extends Component {
       fetchSignUp(this.state.formData, pym.parentUrl || location.href);
       validForm();
     } else {
-      invalidForm(lang.t('signIn.checkTheForm'));
+      invalidForm(lang.t('signIn.check_the_form'));
     }
   }