Tweak where message is added during reset to avoid needing a session Closes #4908