Fix: #251 - Edit name form incorrectly overwrites NAME tag