Fixes bug with 'trust previous users' setting.