updated to utilize password framework