Fixes #3458: We now use the password field type where necessary