Fix removal of user@ from hostname