Also fix clobber of password reset user ID's in config table, and fix
cleanup of client password reset tokens from config table.