Added a per user cutoff date.  This fixes #8370.