updated for dynamic pwd an username