diff --git a/deploy/installer/config/controlscript.js b/deploy/installer/config/controlscript.js
index df7cefee..bf22f8f6 100644
--- a/deploy/installer/config/controlscript.js
+++ b/deploy/installer/config/controlscript.js
@@ -26,7 +26,7 @@ function appInstalled()
     } else if (runningOnMacOS()){
         appInstalledUninstallerPath = "/Applications/" + appName() + ".app/maintenancetool.app/Contents/MacOS/maintenancetool";
     } else if (runningOnLinux()){
-	    appInstalledUninstallerPath = "/opt/" + appName();
+        appInstalledUninstallerPath = "/opt/" + appName() + "/maintenancetool";
     }
 
     return installer.fileExists(appInstalledUninstallerPath) || installer.fileExists(appInstalledUninstallerPath_x86);
@@ -49,7 +49,7 @@ function runningOnMacOS()
 
 function runningOnLinux()
 {
-    return (installer.value("os") === "linux");
+    return ((installer.value("os") === "linux") || (installer.value("os") === "x11"));
 }
 
 function sleep(miliseconds) {
diff --git a/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js b/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
index d752d5a3..aae48338 100644
--- a/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
+++ b/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
@@ -93,7 +93,7 @@ Component.prototype.createOperations = function()
     } else if (runningOnMacOS()) {
         component.addElevatedOperation("Execute", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "@TargetDir@/post_uninstall.sh");
     } else if (runningOnLinux()) {
-	component.addElevatedOperation("Execute", "bash", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "bash", "@TargetDir@/post_uninstall.sh");
+        component.addElevatedOperation("Execute", "bash", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "bash", "@TargetDir@/post_uninstall.sh");
     }
 }