diff --git a/app/modules/keypair/index.ts b/app/modules/keypair/index.ts
index 0b8f7181623a870684073b2d092b76afa2c99816..39e5d42a63823c1584c8292351579b8dc42c151c 100644
--- a/app/modules/keypair/index.ts
+++ b/app/modules/keypair/index.ts
@@ -96,7 +96,7 @@ export const KeypairDependency = {
 
       beforeSave: async (conf:KeypairConfDTO, program:any, logger:any, confDAL:any) => {
 
-        if (program.keyprompt || program.keyfile) {
+        if ((program.keyprompt || program.keyfile) && conf.oldPair) {
           // Don't store the given key, but only the default/saved one
           conf.pair = {
             pub: conf.oldPair.pub,
diff --git a/package.json b/package.json
index da61ed01fea61f0c735fc2462b7a36dae3e2ae14..ee115a016408059cdea7f8a80e405bdbc6304934 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "@types/node": "^8.0.9",
     "@types/should": "^8.3.0",
     "coveralls": "2.11.4",
-    "duniter-bma": "1.3.x",
     "duniter-crawler": "1.3.x",
     "duniter-ui": "1.3.x",
     "eslint": "3.13.1",
@@ -101,7 +100,6 @@
     "typescript": "^2.4.1"
   },
   "peerDependencies": {
-    "duniter-bma": "1.3.x",
     "duniter-crawler": "1.3.x",
     "duniter-ui": "1.3.x"
   },
diff --git a/yarn.lock b/yarn.lock
index 4888f1d8e0ffedc4d39bc3d50275201334d460ab..ee47024d021eca7eb30a8111af5621e31f69ee0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -193,9 +193,9 @@ async@0.1.22:
   version "0.1.22"
   resolved "https://registry.yarnpkg.com/async/-/async-0.1.22.tgz#0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"
 
-async@1.x, async@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+async@1.x, async@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
 
 async@2.2.0, async@^2.0.0:
   version "2.2.0"
@@ -203,14 +203,14 @@ async@2.2.0, async@^2.0.0:
   dependencies:
     lodash "^4.14.0"
 
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
-async@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -938,11 +938,11 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@1.0.2, escape-string-regexp@^1.0.2:
+escape-string-regexp@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
 
-escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"