NOT SO MAJOR CHANGES

Adding the substr to the username, assumed local without @ sign,