[0.7.4.2] Fix for ServerName setting