upap -> pap; rescan pap-secrets for password each time;