added password auth plain text only
merge