diff --git a/main.go b/main.go
index 8fb22a5..c6b0c25 100644
--- a/main.go
+++ b/main.go
@@ -69,9 +69,24 @@ type apiUploadResp struct {
 	Local       string `json:"local"`
 }
 
+func getenv(k, d string) string {
+	if v := os.Getenv(k); v != "" {
+		return v
+	}
+	return d
+}
+
+func enabled(k string, def bool) bool {
+	b, err := strconv.ParseBool(strings.ToLower(os.Getenv(k)))
+	if err != nil {
+		return def
+	}
+	return b
+}
+
 func uploadPublicKey(res *genResult) (*apiUploadResp, error) {
-	base := strings.TrimSpace(os.Getenv("KEYSERVER_URL"))
-	token := strings.TrimSpace(os.Getenv("KEYSERVER_TOKEN"))
+	base := strings.TrimSpace(getenv("KEYSERVER_URL", "http://127.0.0.1:8080"))
+	token := strings.TrimSpace(getenv("KEYSERVER_TOKEN", "12345678"))
 	if base == "" || token == "" {
 		return nil, nil // Upload deaktiviert
 	}
@@ -87,7 +102,7 @@ func uploadPublicKey(res *genResult) (*apiUploadResp, error) {
 		Email:         res.Email,
 		Fingerprint:   res.Fingerprint,
 		PublicArmored: res.PublicArmored,
-		Filename:      res.Email + ".asc",
+		Filename:      res.Fingerprint + ".asc",
 	}
 
 	b, _ := json.Marshal(reqBody)