Fixed bug #3775 - Token mismatch on 2nd and subsequent server