Fix en login
Merge branch 'dev_raul' into dev