Increase coverage of Passwords from 42% to 98%