Fix issue MR-214 - Hostname/IP reset