Fixed issues when User_Name contains spaces.
Added support for quotes in User_Name values.