diff --git a/client/src/pages/constellation/addDevice.jsx b/client/src/pages/constellation/addDevice.jsx
index 22b47dc..8d09d25 100644
--- a/client/src/pages/constellation/addDevice.jsx
+++ b/client/src/pages/constellation/addDevice.jsx
@@ -111,12 +111,12 @@ const AddDeviceModal = ({ users, config, isAdmin, refreshConfig, devices }) => {
                   />
                   <DownloadFile
                     filename={isDone.DeviceName + `.key`}
-                    content={isDone.PrivateKey}
+                    content={isDone.PublicKey}
                     label={"Download " + isDone.DeviceName + `.key`}
                   />
                   <DownloadFile
                     filename={isDone.DeviceName + `.crt`}
-                    content={isDone.PublicKey}
+                    content={isDone.PrivateKey}
                     label={"Download " + isDone.DeviceName + `.crt`}
                   />
                   <DownloadFile
diff --git a/package.json b/package.json
index 11dd3e5..3a6fe6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.10.0-unstable2",
+  "version": "0.10.0-unstable3",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/src/constellation/api_devices_create.go b/src/constellation/api_devices_create.go
index f18c6f3..adab752 100644
--- a/src/constellation/api_devices_create.go
+++ b/src/constellation/api_devices_create.go
@@ -70,7 +70,7 @@ func DeviceCreate(w http.ResponseWriter, req *http.Request) {
 			_, err3 := c.InsertOne(nil, map[string]interface{}{
 				"Nickname": nickname,
 				"DeviceName": deviceName,
-				"PublicKey": cert,
+				"PublicKey": key,
 				"IP": request.IP,
 			})
 
@@ -103,8 +103,8 @@ func DeviceCreate(w http.ResponseWriter, req *http.Request) {
 				"data": map[string]interface{}{
 					"Nickname": nickname,
 					"DeviceName": deviceName,
-					"PublicKey": cert,
-					"PrivateKey": key,
+					"PublicKey": key,
+					"PrivateKey": cert,
 					"IP": request.IP,
 					"Config": configYml,
 					"CA": capki,