handle case where password changes between app launches; two bug fixes