Added password login and fixed modal close