Merge "Changed the password $valid check condition"