Added password (masked) and email prompt
Some refactoring