Add password handling