Merge "Fix incorrect password attempts messaging on headless" into main