diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
index 13f3e81..1c487da 100644
--- a/src/api/core/accounts.rs
+++ b/src/api/core/accounts.rs
@@ -210,7 +210,12 @@ fn post_keys(data: JsonUpcase<KeysData>, headers: Headers, conn: DbConn) -> Json
     user.public_key = Some(data.PublicKey);
 
     user.save(&conn)?;
-    Ok(Json(user.to_json(&conn)))
+
+    Ok(Json(json!({
+        "PrivateKey": user.private_key,
+        "PublicKey": user.public_key,
+        "Object":"keys"
+    })))
 }
 
 #[derive(Deserialize)]
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
index 043ee3c..442d196 100644
--- a/src/db/models/organization.rs
+++ b/src/db/models/organization.rs
@@ -274,6 +274,8 @@ impl UserOrganization {
             "UseGroups": false,
             "UseTotp": true,
             "UsePolicies": true,
+            "UseApi": false,
+            "SelfHost": true,
 
             "MaxStorageGb": 10, // The value doesn't matter, we don't check server-side