Venky: This commit fixes defect #2 related to passwords being shown as plain text