diff --git a/conf.js b/conf.js
index 1bdab893..b0109aad 100644
--- a/conf.js
+++ b/conf.js
@@ -57,6 +57,10 @@ if (process.browser){
 }
 exports.database = {};
 
+// allows to set the directory for the database
+// add to conf.js in project root
+// if not set: default behaviour (e.g. ~/.config/byteball on a linux system)
+//exports.DatabaseDir = '/home/john/myDatabaseDir';
 
 /*
 There are 3 ways to customize conf in modules that use byteballcore lib:
diff --git a/desktop_app.js b/desktop_app.js
index 33563962..eb555c9e 100644
--- a/desktop_app.js
+++ b/desktop_app.js
@@ -53,7 +53,16 @@ function getAppDataDir(){
 	return (getAppsDataDir() + '/' + getAppName());
 }
 
+// database can be located in another directory
+function getDatabaseDir(){
+
+	const customDatabaseDir = require('./conf.js').DatabaseDir;
+	if (customDatabaseDir) return customDatabaseDir;
+
+	return getAppDataDir();
+}
 
 exports.getAppRootDir = getAppRootDir;
 exports.getAppDataDir = getAppDataDir;
+exports.getDatabaseDir = getDatabaseDir;
 
diff --git a/sqlite_pool.js b/sqlite_pool.js
index 8e78609b..686020ad 100644
--- a/sqlite_pool.js
+++ b/sqlite_pool.js
@@ -16,7 +16,7 @@ if (bCordova){
 }
 else{
 	sqlite3 = require('sqlite3');//.verbose();
-	path = require('./desktop_app.js'+'').getAppDataDir() + '/';
+	path = require('./desktop_app.js'+'').getDatabaseDir() + '/';
 	console.log("path="+path);
 }
 
diff --git a/wallet.js b/wallet.js
index e4344692..64c05709 100644
--- a/wallet.js
+++ b/wallet.js
@@ -175,6 +175,11 @@ function handleMessageFromHub(ws, json, device_pubkey, bIndirectCorrespondent, c
 			callbacks.ifOk();
 			break;
 		
+		case "remove_paired_device":
+			device.removeCorrespondentDevice(from_address, function(){});
+			callbacks.ifOk();
+			break;
+
 		case "create_new_wallet":
 			// {wallet: "base64", wallet_definition_template: [...]}
 			walletDefinedByKeys.handleOfferToCreateNewWallet(body, from_address, callbacks);