Fix some of the command line password stuff. New function