Reordered the locking and setting of user email addresses to avoid a race condition...