Some ajustement on login mechanism