Improved password prompt (2-8-2013, v2)