client links and username fix