diff --git a/custom/js/helper.js b/custom/js/helper.js
index feab9ac..c386ca0 100644
--- a/custom/js/helper.js
+++ b/custom/js/helper.js
@@ -27,11 +27,8 @@ function renderClientList(data) {
                             <img src="${obj.QRCode}" />
                             <div class="info-box-content">
                                 <div class="btn-group">
-                                    <button onclick="location.href='/download?clientid=${obj.Client.id}'" type="button"
-                                        class="btn btn-outline-success btn-sm">Download</button>
-                                    <button type="button" class="btn btn-outline-warning btn-sm" data-toggle="modal"
-                                        data-target="#modal_email_client" data-clientid="${obj.Client.id}"
-                                        data-clientname="${obj.Client.name}">Email</button>
+                                    <a href="/download?clientid=${obj.Client.id}"
+                                        class="btn btn-outline-success btn-sm">Download</a>
                                     <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal"
                                         data-target="#modal_edit_client" data-clientid="${obj.Client.id}"
                                         data-clientname="${obj.Client.name}">Edit</button>
diff --git a/handler/routes.go b/handler/routes.go
index 8fcbab7..db837db 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -346,7 +346,7 @@ func DownloadClient(db store.IStore) 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)
 	}
 }