Added dynamic password support