Merge "add properties for username and password"