1 files changed, 5 insertions, 1 deletions

diff --git a/src/index.js b/src/index.js
index 73fc6e299..1b982c77e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,11 @@ import windowStateKeeper from 'electron-window-state';
 
 // Set app directory before loading user modules
 if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+  app.setPath('userData', path.join(app.getPath('appData'), app.getName() + 'Dev'));
+} else if (process.env.FERDI_USERDATA_DIR != null) {
+  app.setPath('userData', process.env.FERDI_USERDATA_DIR)
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('userData', path.join(process.env.PORTABLE_EXECUTABLE_DIR, app.getName()));
 }
 
 /* eslint-disable import/first */