diff --git a/pkg/server/root_normal.go b/pkg/server/root_normal.go
index ab62274b4..eca54c273 100644
--- a/pkg/server/root_normal.go
+++ b/pkg/server/root_normal.go
@@ -20,11 +20,16 @@ package server
 
 import (
 	"os/user"
+
+	"camlistore.org/pkg/osutil"
 )
 
 func getUserName() (string, error) {
 	u, err := user.Current()
 	if err != nil {
+		if v := osutil.Username(); v != "" {
+			return v, nil
+		}
 		return "", err
 	}
 	return u.Name, nil