diff -Nur e-smith-base-5.4.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.4.0_bz8030/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm
--- e-smith-base-5.4.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm	2013-12-15 01:30:54.703944618 +0100
+++ e-smith-base-5.4.0_bz8030/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm	2013-12-15 01:35:07.201609871 +0100
@@ -257,9 +257,9 @@
             my $rec = $hdb->get("$oldSystemName.$DomainName");
             $rec->delete if $rec;
         
-            # Update ServerName if was oldSystemName 
+            # Update ServerName if was oldSystemName or not set
             my $oldServerName = $db->get_prop("smb", "ServerName");
-            if ($oldSystemName eq $oldServerName)
+            if (!defined($oldServerName) || ($oldSystemName eq $oldServerName))
             {
                 $db->set_prop("smb", "ServerName", $SystemName);
             }