Merge changes in forms
Hid server name