diff --git a/src/zeronetavahi b/src/zeronetavahi
index b4f18ddc..f89efd82 100755
--- a/src/zeronetavahi
+++ b/src/zeronetavahi
@@ -34,10 +34,11 @@
 WEB_PAGE_TITLE="Freedombone Mesh"
 TRACKER_PORT=6969
 ZERONET_INSTALL=/opt/zeronet
+MY_USERNAME=$USER
 
 if [ ! -d $ZERONET_INSTALL ]; then
-    if [ -d /home/$USER/zeronet ]; then
-        ZERONET_INSTALL=/home/$USER/zeronet
+    if [ -d /home/$MY_USERNAME/zeronet ]; then
+        ZERONET_INSTALL=/home/$MY_USERNAME/zeronet
     else
         exit 0
     fi
@@ -46,7 +47,7 @@ fi
 BOOTSTRAP_FILE=$ZERONET_INSTALL/bootstrap
 BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
-ZERONET_INDEX=/home/$USER/mesh.html
+ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
 
 function create_index {
     if [ -f $ZERONET_INDEX ]; then