m_watch Be more strict when checking whether the watch list of a user is full

After a rehash MAX_WATCH can become lower than it was before