Previous fix to race condition broke things when userunblock, fix in better way.