Fix an issue where a user would be prompted for a password multiple times