diff --git a/client/entry.coffee b/client/entry.coffee
index 8da0e5f3..3c2d4822 100644
--- a/client/entry.coffee
+++ b/client/entry.coffee
@@ -9,6 +9,7 @@ AccountsEntry =
     entrySignUp: '/sign-up'
     extraSignUpFields: []
     showOtherLoginServices: true
+    fromWhere:false
 
   isStringEmail: (email) ->
     emailPattern = /^([\w.-]+)@([\w.-]+)\.([a-zA-Z.]{2,6})$/i
diff --git a/client/t9n/spanish.coffee b/client/t9n/spanish.coffee
index 074d21d1..5da81565 100644
--- a/client/t9n/spanish.coffee
+++ b/client/t9n/spanish.coffee
@@ -3,10 +3,10 @@ es =
   signOut: "Salir"
   signUp: "Suscribir"
   OR: "O"
-  forgotPassword: "Contraseña olvidada?"
+  forgotPassword: "¿Contraseña olvidada?"
   emailAddress: "Dirección de Email"
   emailResetLink: "Reiniciar Email"
-  dontHaveAnAccount: "No tenés una cuenta?"
+  dontHaveAnAccount: "¿No tenés una cuenta?"
   resetYourPassword: "Resetear tu contraseña"
   updateYourPassword: "Actualizar tu contraseña"
   password: "Contraseña"
@@ -16,10 +16,10 @@ es =
   signUpWithYourEmailAddress: "Suscribir con tu email"
   username: "Usuario"
   optional: "Opcional"
-  signupCode: "Codigo para suscribir"
-  clickAgree: "Si haces clic en Sucribir estas de acuerdo con la"
+  signupCode: "Código para suscribir"
+  clickAgree: "Si haces clic en Suscribir estas de acuerdo con la"
   privacyPolicy: "Póliza de Privacidad"
-  terms: "Terminos de Uso"
+  terms: "Términos de Uso"
   sign: "Ingresar"
   configure: "Disposición"
   with: "con"
diff --git a/client/views/signIn/signIn.coffee b/client/views/signIn/signIn.coffee
index 96bfb682..12b0990b 100644
--- a/client/views/signIn/signIn.coffee
+++ b/client/views/signIn/signIn.coffee
@@ -42,7 +42,7 @@ AccountsEntry.entrySignInEvents = {
       Session.set('password', undefined)
       if error
         T9NHelper.accountsError error
-      else if Session.get('fromWhere')
+      else if Session.get('fromWhere') and AccountsEntry.settings.fromWhere
         Router.go Session.get('fromWhere')
         Session.set('fromWhere', undefined)
       else
diff --git a/client/views/signIn/signIn.html b/client/views/signIn/signIn.html
index 174a087e..1dd3ef0a 100644
--- a/client/views/signIn/signIn.html
+++ b/client/views/signIn/signIn.html
@@ -28,7 +28,7 @@ <h3>{{t9n "signIn"}}</h3>
         {{#if passwordLoginService}}
           <form class="entry-form" id='signIn'>
             <div class="form-group">
-              <input autofocus name="email" type="{{emailInputType}}" class="form-control" value='{{email}}' placeholder="{{emailPlaceholder}}">
+              <input autofocus name="email" type="{{emailInputType}}" class="form-control" value='{{email}}' placeholder="{{t9n 'email'}}">
             </div>
             <div class="form-group">
               <input name="password" type="password" class="form-control" value='{{password}}' placeholder="{{t9n 'password'}}">
diff --git a/client/views/signUp/signUp.html b/client/views/signUp/signUp.html
index b2a693c0..fa4c518f 100644
--- a/client/views/signUp/signUp.html
+++ b/client/views/signUp/signUp.html
@@ -32,7 +32,7 @@ <h3>{{t9n "createAccount"}}</h3>
             {{#if showUsername}}
               <div class="form-group">
                 <label>{{t9n "username"}}</label>
-                <input autofocus name="username" type="string" class="form-control" value=''>
+                <input autofocus name="username" type="string" class="form-control" value='' placeholder="{{t9n 'username'}}">
               </div>
             {{/if}}
 
@@ -40,22 +40,22 @@ <h3>{{t9n "createAccount"}}</h3>
               <div class="form-group">
                 <label>{{t9n "emailAddress"}}</label>
                 {{#if showUsername}}
-                  <input type="email" class="form-control" value='{{emailAddress}}'>
+                  <input type="email" class="form-control" value='{{emailAddress}}' placeholder="{{t9n 'email'}}">
                 {{else}}
-                  <input autofocus type="email" class="form-control" value='{{emailAddress}}'>
+                  <input autofocus type="email" class="form-control" value='{{emailAddress}}' placeholder="{{t9n 'email'}}">
                 {{/if}}
               </div>
             {{/if}}
 
             <div class="form-group">
               <label>{{t9n "password"}}</label>
-              <input type="password" class="form-control" value=''>
+              <input type="password" class="form-control" value='' placeholder="{{t9n 'password'}}">
             </div>
 
             {{#if showSignupCode}}
               <div class="form-group">
                 <label>{{t9n "signupCode"}}</label>
-                <input name="signupCode" type="string" class="form-control" value=''>
+                <input name="signupCode" type="string" class="form-control" value='' placeholder="{{t9n 'signupCode'}}">
               </div>
             {{/if}}