diff --git a/src/freedombone-meshweb b/src/freedombone-meshweb
index 1b8e88f0..1a8e3ce0 100755
--- a/src/freedombone-meshweb
+++ b/src/freedombone-meshweb
@@ -60,7 +60,7 @@ if [ ${ctr} -lt "1" ]; then
    exit 0
 fi
 
-ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
+ZERONET_INDEX=$MESH_INSTALL_DIR/zeronet/mesh.html
 
 if which firefox > /dev/null; then
     firefox $ZERONET_INDEX
diff --git a/src/zeronetavahi b/src/zeronetavahi
index a799cbcf..f2375840 100755
--- a/src/zeronetavahi
+++ b/src/zeronetavahi
@@ -40,22 +40,13 @@ MESH_INSTALL_DIR=/var/lib
 WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
 TRACKER_PORT=6969
 ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
-ZERONET_USER_HOME=/home/zeronet
 MY_USERNAME=$USER
 
-if [ ! -d $ZERONET_INSTALL ]; then
-	if [ -d /home/$MY_USERNAME/zeronet ]; then
-		ZERONET_INSTALL=/home/$MY_USERNAME/zeronet
-	else
-		exit 0
-	fi
-fi
-
 BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
 MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
 FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
 TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
-ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
+ZERONET_INDEX=$ZERONET_INSTALL/mesh.html
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
 
 IPFS_PORT=4001
@@ -361,7 +352,7 @@ function zeronet_update_config {
 		fi
 	fi
 	rm -f $ZERONET_CONFIG.new
-	if [ -d $ZERONET_USER_HOME ]; then
+	if [ -d $ZERONET_INSTALL ]; then
 		sudo chown zeronet:zeronet $ZERONET_CONFIG
 	fi
 }
@@ -393,9 +384,9 @@ create_footer $TOX_USERS_FILE
 # make the index page
 create_index
 
-assemble_web_page ${BLOGS_FILE} $ZERONET_USER_HOME
-assemble_web_page ${MAIL_FILE} $ZERONET_USER_HOME
-assemble_web_page ${FORUM_FILE} $ZERONET_USER_HOME
-assemble_web_page ${TOX_USERS_FILE} $ZERONET_USER_HOME
+assemble_web_page ${BLOGS_FILE} $ZERONET_INSTALL
+assemble_web_page ${MAIL_FILE} $ZERONET_INSTALL
+assemble_web_page ${FORUM_FILE} $ZERONET_INSTALL
+assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
 
 exit 0