Added handler for legacy domains without @ (linux system users)