@@ -, +, @@ 
---
 .../x11-autologin/rootfs/image-scripts.d/40-x11-autologin        | 9 +++++++++
 1 file changed, 9 insertions(+)
--- a/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin	
+++ a/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin	
@@ -55,6 +55,15 @@ fi
 LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
 	backup "$LIGHTDM_CONF"
+	default_session="$(ls -1 /usr/share/xsessions/*.desktop | sed -n 's/^.*\/\([^/]\+\)\.desktop$/\1/;1p')"
+	account_file="/var/lib/AccountsService/users/$USER"
+	if [ -n "$default_session" ] && [ ! -f "$account_file" ]; then
+		cat > "$account_file" << EOF
+[User]
+XSession=$default_session
+SystemAccount=false
+EOF
+	fi
 	sed -i \
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
--