diff --git a/ISOconfig.sh b/ISOconfig.sh
index dce2527fa..bf658986c 100755
--- a/ISOconfig.sh
+++ b/ISOconfig.sh
@@ -124,8 +124,8 @@ echo "$XZUID" > ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid
 ########################################################################
 echo "CREATE + profile"
 ########################################################################
-~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "/home/xbian/.zen/astrXbian/logo.png" #CESIUM+
-~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" set --name "$XZUID" --avatar "/home/xbian/.zen/astrXbian/logo.png" #GCHANGE+
+~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "/home/$USER/.zen/astrXbian/logo.png" #CESIUM+
+~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" set --name "$XZUID" --avatar "/home/$USER/.zen/astrXbian/logo.png" #GCHANGE+
 ### REVERT
 # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" erase
 # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" erase
diff --git a/install.sh b/install.sh
index 9761ffe14..6d00896cc 100755
--- a/install.sh
+++ b/install.sh
@@ -49,9 +49,9 @@ sudo fail2ban restart
 ### Install astrxbian & NGINX config
 sudo rm -Rf /var/www/astrxbian
 sudo mkdir -p /var/www/astrxbian
-sudo cp -Rf /home/xbian/.zen/astrXbian/www/xbian/* /var/www/astrxbian
-sudo chown -R xbian:xbian /var/www/astrxbian
-sudo cp -f /home/xbian/.zen/astrXbian/.install/templates/nginx/astrxbian.conf /etc/nginx/conf.d/
+sudo cp -Rf /home/$USER/.zen/astrXbian/www/xbian/* /var/www/astrxbian
+sudo chown -R $USER:$USER /var/www/astrxbian
+sudo cp -f /home/$USER/.zen/astrXbian/.install/templates/nginx/astrxbian.conf /etc/nginx/conf.d/
 
 # TODO #######################################################################
 # echo "Install JUKEBOOX"