Ref #4191 - Edit System won't work because Systemname already in use