Merge "Fix the password input"