diff --git a/handler/routes.go b/handler/routes.go
index 22df3d7..74fa6d3 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -346,7 +346,7 @@ func DownloadClient() echo.HandlerFunc {
 		reader := strings.NewReader(config)
 
 		// set response header for downloading
-		c.Response().Header().Set(echo.HeaderContentDisposition, "attachment; filename=wg0.conf")
+		c.Response().Header().Set(echo.HeaderContentDisposition, fmt.Sprintf("attachment; filename=%s.conf", clientData.Client.Name))
 		return c.Stream(http.StatusOK, "text/plain", reader)
 	}
 }