Fix for 'trust previous users' feature.