Port saves correctly for create/update servers.  Fixes Issue #1.