@@ -434,12 +434,14 @@
 				     (servinf     (conc servinfodir"/"ipaddr":"port)))
 				(if (not (file-exists? servinfodir))
 				    (create-directory servinfodir #t))
 				(with-output-to-file servinf
 				  (lambda ()
-				    (print "SERVER STARTED: "ipaddr":"port" AT "(current-seconds)" server-id: "(server:get-client-signature))
-				    (print "started: "(seconds->year-week/day-time (current-seconds)))))
+				    (let* ((serv-id (server:mk-signature)))
+				      (set! *server-id* serv-id)
+				      (print "SERVER STARTED: "ipaddr":"port" AT "(current-seconds)" server-id: "serv-id)
+				      (print "started: "(seconds->year-week/day-time (current-seconds))))))
 				(set! *on-exit-procs* (cons
 						       (lambda ()
 							 (delete-file* servinf))
 						       *on-exit-procs*))
 				;; put data about this server into a simple flat file host.port
@@ -535,11 +537,11 @@
 		(new-port  (cadr sdat)))
 	    (debug:print-info 0 *default-log-port* "WARNING: interface changed, refreshing iface and port info")
 	    (set! iface new-iface)
 	    (set! port  new-port)
              (if (not *server-id*)
-              (set! *server-id* (server:mk-signature)))
+		 (set! *server-id* (server:mk-signature)))
 	    (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
 	    (flush-output *default-log-port*)))
       
       ;; Transfer *db-last-access* to last-access to use in checking that we are still alive
       (mutex-lock! *heartbeat-mutex*)