Moved password prompt to on launch close #4