Merge portable and net45 clients