Add secure password input and a bit more logging