diff --git a/src/dashboard.py b/src/dashboard.py
index 6d88ba9..dea48fb 100644
--- a/src/dashboard.py
+++ b/src/dashboard.py
@@ -1660,12 +1660,17 @@ class Peer:
         if len(filename) == 0:
             filename = "UntitledPeer"
         filename = "".join(filename.split(' '))
-        filename = f"{filename}_{self.configuration.Name}"
+        filename = f"{filename}"
         illegal_filename = [".", ",", "/", "?", "<", ">", "\\", ":", "*", '|' '\"', "com1", "com2", "com3",
                             "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4",
                             "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "con", "nul", "prn"]
         for i in illegal_filename:
             filename = filename.replace(i, "")
+        
+        finalFilename = ""
+        for i in filename:
+            if re.match("^[a-zA-Z0-9_=+.-]{1,15}$", i):
+                finalFilename += i
 
         peerConfiguration = f'''[Interface]
 PrivateKey = {self.private_key}
@@ -1685,7 +1690,7 @@ PersistentKeepalive = {str(self.keepalive)}
         if len(self.preshared_key) > 0:
             peerConfiguration += f"PresharedKey = {self.preshared_key}\n"
         return {
-            "fileName": filename,
+            "fileName": finalFilename,
             "file": peerConfiguration
         }
 
@@ -2724,7 +2729,7 @@ def API_downloadAllPeers(configName):
     untitledPeer = 0
     for i in configuration.Peers:
         file = i.downloadPeer()
-        if file["fileName"] == "UntitledPeer_" + configName:
+        if file["fileName"] == "UntitledPeer":
             file["fileName"] = str(untitledPeer) + "_" + file["fileName"]
             untitledPeer += 1
         peerData.append(file)
diff --git a/src/static/app/src/components/configurationComponents/peerSearch.vue b/src/static/app/src/components/configurationComponents/peerSearch.vue
index 7c65f2b..004e4ad 100644
--- a/src/static/app/src/components/configurationComponents/peerSearch.vue
+++ b/src/static/app/src/components/configurationComponents/peerSearch.vue
@@ -75,7 +75,9 @@ export default {
 		},
 		downloadAllPeer(){
 			fetchGet(`/api/downloadAllPeers/${this.configuration.Name}`, {}, (res) => {
-				console.log(res);
+				res.data.forEach(x => {
+					x.fileName = x.fileName + '.conf'
+				})
 				window.wireguard.generateZipFiles(res, this.configuration.Name)
 			})
 		}
diff --git a/src/static/app/src/components/configurationList.vue b/src/static/app/src/components/configurationList.vue
index 8a94261..140b3a6 100644
--- a/src/static/app/src/components/configurationList.vue
+++ b/src/static/app/src/components/configurationList.vue
@@ -98,7 +98,7 @@ export default {
 	<div class="mt-md-5 mt-3">
 		<div class="container-fluid">
 			<SystemStatus></SystemStatus>
-			<div class="d-flex mb-4 configurationListTitle align-items-md-center gap-3 flex-column flex-md-row">
+			<div class="d-flex mb-4 configurationListTitle align-items-md-center gap-2 flex-column flex-md-row">
 				<h2 class="text-body d-flex mb-0">
 					<LocaleText t="WireGuard Configurations"></LocaleText>
 				</h2>