fixed password handling and prompting