Add esc and clean login