Removed unnecessary user name trimming, closes #22