diff --git a/install.sh b/install.sh
index e31fced..d5cebbf 100755
--- a/install.sh
+++ b/install.sh
@@ -198,7 +198,8 @@ install_uninstaller()
 # Dependencies
 export NODE_PATH=/opt/walnut/lib/node_modules
 export NPM_CONFIG_PREFIX=/opt/walnut
-mkdir -p $NODE_PATH
+$sudo_cmd mkdir -p $NODE_PATH
+$sudo_cmd chown -R $(whoami) /opt/walnut
 dap_dl_bash "https://git.daplie.com/coolaj86/node-install-script/raw/master/setup-min.sh"
 
 # Install
@@ -260,6 +261,9 @@ create_skeleton
 install_uninstaller
 install_service
 
+$sudo_cmd chown -R www-data:www-data /opt/walnut || true
+$sudo_cmd chown -R _www:_www /opt/walnut || true
 $sudo_cmd chown -R www-data:www-data /srv/walnut || true
 $sudo_cmd chown -R _www:_www /srv/walnut || true
-$sudo_cmd chmod -R ug+rwX /srv/walnut
+$sudo_cmd chmod -R ug+rwXs /srv/walnut
+$sudo_cmd chmod -R ug+rwXs /opt/walnut