Fixed not using a user name breaking domain shortening