diff --git a/release.sh b/release.sh
index 5a06c22dc40260aec926844e33a90cd9513a133c..82c2cd28693bac0dfab80b0749e9650617fa1c79 100755
--- a/release.sh
+++ b/release.sh
@@ -23,9 +23,9 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
   case "$1" in
     rel|pre)
       # Change the version in package.json and test file
-      sed -i "s/version\": \"$current/version\": \"$2/g" package.json
-      sed -i "s/ version=\".*\"/ version=\"$2\"/g" config.xml
-      sed -i "s/ android-versionCode=\".*\"/ android-versionCode=\"$3\"/g" config.xml
+      sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json
+      sed -i "s/ version=\"[^\"]+\"/ version=\"$2\"/g" config.xml
+      sed -i "s/ android-versionCode=\"[^\"]+\"/ android-versionCode=\"$3\"/g" config.xml
 
       # Bump the install.sh
       sed -i "s/echo \"v.*\" #lastest/echo \"v$2\" #lastest/g" install.sh
diff --git a/www/js/controllers/join-controllers.js b/www/js/controllers/join-controllers.js
index 114be6c1e8a3c0c823321550b43c7e38007f12d3..64c5290965f868547d92c14e53cf6955a83aa121 100644
--- a/www/js/controllers/join-controllers.js
+++ b/www/js/controllers/join-controllers.js
@@ -377,7 +377,8 @@ function JoinModalController($scope, $state, $interval, $timeout, UIUtils, Crypt
         okType: 'button-assertive',
         cancelText: 'COMMON.BTN_LATER'
       })
-    .then(function() {
+    .then(function(confirm) {
+      if (!confirm) return;
       return csWallet.downloadRevocation();
     });
   };