Fix for truncation of IncomingUser on a restart