Added support for windows username