Password support (10/12)

Password support