Fix issue where Emacs 24 tries to autodetect ControlMaster and make its own socket, and have emed preserve username.