diff --git a/Dockerfile b/Dockerfile
index a3a9647..ecc96e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,11 @@ RUN set -eux; \
 
 # Replace symbolic links
 FROM install AS build
-RUN  mkdir -p /var/lib/boinc-client/locale
+RUN set -eux; \
+    mkdir -p /var/lib/boinc-client/locale; \
+    touch /etc/boinc-client/boinctui.cfg; \
+    chown boinc:boinc /etc/boinc-client/*; \
+    ln -s /etc/boinc-client/boinctui.cfg /var/lib/boinc-client/.boinctui.cfg 
 COPY start /
 USER boinc
 WORKDIR /var/lib/boinc-client
diff --git a/start b/start
index 8681ec5..030794d 100755
--- a/start
+++ b/start
@@ -37,9 +37,13 @@ if [ "`whoami`"=="boinc" ]; then
 		rm -f /var/lib/boinc-client/global_prefs_override.xml
 		ln -s /etc/boinc-client/global_prefs_override.xml /var/lib/boinc-client/global_prefs_override.xml
 	fi
+	if [ -f /var/lib/boinc-client/.boinctui.cfg ] && [ ! -h /var/lib/boinc-client/.boinctui.cfg ]; then
+		rm -f /var/lib/boinc-client/.boinctui.cfg
+		ln -s /etc/boinc-client/boinctui.cfg /var/lib/boinc-client/.boinctui.cfg
+	fi
 
 	# tool setup
-	cat > "/var/lib/boinc-client/.boinctui.cfg" <<- END
+	cat > "/etc/boinc-client/boinctui.cfg" <<- END
 	<boinctui_cfg>
 		<server>
 			<host>localhost</host>