diff --git a/README.md b/README.md
index dbc941dd..6daca1b2 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 [![Docker](https://img.shields.io/docker/v/weejewel/wg-easy/latest)](https://hub.docker.com/r/weejewel/wg-easy)
 [![Docker](https://img.shields.io/docker/pulls/weejewel/wg-easy.svg)](https://hub.docker.com/r/weejewel/wg-easy)
 [![Sponsor](https://img.shields.io/github/sponsors/weejewel)](https://github.com/sponsors/WeeJeWel)
+![GitHub Stars](https://img.shields.io/github/stars/weejewel/wg-easy)
 
 You have found the easiest way to install & manage WireGuard on any Linux host!
 
diff --git a/src/lib/Server.js b/src/lib/Server.js
index 0279796f..46b37831 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -105,7 +105,7 @@ module.exports = class Server {
           .replace(/(-{2,}|-$)/g, '-')
           .replace(/-$/, '')
           .substring(0, 32);
-        res.header('Content-Disposition', `attachment; filename="${configName}.conf"`);
+        res.header('Content-Disposition', `attachment; filename="${configName || clientId}.conf"`);
         res.header('Content-Type', 'text/plain');
         res.send(config);
       }))