Fixed issue with ' in username