diff --git a/install.sh b/install.sh
index f4a3b06..13ce687 100755
--- a/install.sh
+++ b/install.sh
@@ -5,7 +5,7 @@
 #############
 
 # default installation directory
-INSTALL_DIR_DEFAULT="/usr/local/bin"
+INSTALL_DIR_DEFAULT="/usr/local/sbin"
 # URI of "kiwi" launcher script
 KIWI_URI="https://raw.githubusercontent.com/ldericher/kiwi-scp/master/kiwi"
 
diff --git a/kiwi b/kiwi
index f03783d..ff64118 100755
--- a/kiwi
+++ b/kiwi
@@ -25,7 +25,7 @@ KIWI_VERSION="master"
 KIWI_URI="https://raw.githubusercontent.com/ldericher/kiwi-scp/master/kiwi"
 INSTALLER_URI="https://raw.githubusercontent.com/ldericher/kiwi-scp/master/install.sh"
 # canary file: limit curl requests
-CANARY_FILENAME="/tmp/kiwi-scp.canary"
+CANARY_FILENAME="/tmp/kiwi-scp-$(id -u).canary"
 CANARY_MAX_AGE=600
 
 ###################