Add realname support. Guard against race conditions on Disconnect
2 files changed