diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 5da647f0..6ac55841 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -575,6 +575,20 @@ function mesh_client_startup_applications {
 		mkdir -p $rootdir/home/$MY_USERNAME/.config/autostart
 	fi
 
+	START_DESKTOP=$rootdir/home/$MY_USERNAME/.config/autostart/mesh-desktop
+	echo '#!/bin/bash' > $START_DESKTOP
+	echo 'PID=$(pgrep mate-session)' >> $START_DESKTOP
+	echo 'export DBUS_SESSION_BUS_ADDRESS=$(grep -z DBUS_SESSION_BUS_ADDRESS /proc/$PID/environ|cut -d= -f2-)' >> $START_DESKTOP
+	echo 'gsettings set org.mate.caja.desktop volumes-visible false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/caja/desktop/computer-icon-visible false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/caja/desktop/home-icon-visible false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/caja/desktop/network-icon-visible false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/caja/desktop/trash-icon-visible false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/caja/desktop/volumes-visible false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/desktop/media-handling/automount-open false' >> $START_DESKTOP
+	echo 'dconf write /org/mate/desktop/screensaver/lock-enabled false' >> $START_DESKTOP
+	chmod +x $START_DESKTOP
+
 	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
 }
 
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 9209f4c9..51658861 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -531,10 +531,6 @@ function disable_password_logins {
 	sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config
 }
 
-function disable_screen_lock {
-	dconf write /org/gnome/desktop/screensaver/lock-enabled false
-}
-
 function enable_batman_daemon {
 	systemctl enable batman
 	systemctl daemon-reload
@@ -610,8 +606,6 @@ function create_tomb {
 	tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
 	tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
 	tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
-	gsettings set org.mate.caja.desktop volumes-visible false
-
 	# stop stuff from popping up
 	pkill caja
 
@@ -726,20 +720,6 @@ function setup_amnesic_data {
 	fi
 }
 
-function setup_dconf {
-	if [ -d /home/${MY_USERNAME}/Desktop ]; then
-		PID=$(pgrep gnome-session)
-		export DBUS_SESSION_BUS_ADDRESS=$(grep -z DBUS_SESSION_BUS_ADDRESS /proc/$PID/environ|cut -d= -f2-)
-
-		dconf write /org/mate/caja/desktop/computer-icon-visible false
-		dconf write /org/mate/caja/desktop/home-icon-visible false
-		dconf write /org/mate/caja/desktop/network-icon-visible false
-		dconf write /org/mate/caja/desktop/trash-icon-visible false
-		dconf write /org/mate/caja/desktop/volumes-visible false
-		dconf write /org/mate/desktop/media-handling/automount-open false
-	fi
-}
-
 # whether to reset the identity
 set_new_identity=
 if [ $2 ]; then
@@ -777,7 +757,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
 
 	echo $'Beginning mesh node setup' >> $INSTALL_LOG
 
-	setup_dconf
 	tomb slam all
 	enable_batman_daemon
 	create_ram_disk 1
@@ -792,7 +771,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
 	create_tox_user
 	configure_zeronet
 	disable_password_logins
-	disable_screen_lock
 	mesh_amnesic
 
 	if [ ! -f $MESH_AMNESIC ]; then