diff --git a/salt/desktop/files/session.jinja b/salt/desktop/files/session.jinja
new file mode 100644
index 000000000..823e62f2d
--- /dev/null
+++ b/salt/desktop/files/session.jinja
@@ -0,0 +1,7 @@
+# This file is managed by Salt in the desktop.xwindows state
+# It will not be overwritten if it already exists
+
+[User]
+Session=gnome-classic
+Icon=/home/{{USERNAME}}/.face
+SystemAccount=false
diff --git a/salt/desktop/xwindows.sls b/salt/desktop/xwindows.sls
index ebb7ecb9f..792724eb4 100644
--- a/salt/desktop/xwindows.sls
+++ b/salt/desktop/xwindows.sls
@@ -18,6 +18,23 @@ convert_gnome_classic:
   cmd.script:
     - name: salt://desktop/scripts/convert-gnome-classic.sh
 
+{% for username in salt['file.find'](path='/home/',mindepth=1,maxdepth=1,type='d') %}
+{%   set username = username.split('/')[2] %}
+{%   if username != 'zeek' %}
+{%     if not salt['file.file_exists']('/var/lib/AccountsService/users/' ~ username) %}
+
+{{username}}_session:
+  file.managed:
+    - name: /var/lib/AccountsService/users/{{username}}
+    - source: salt://desktop/files/session.jinja
+    - template: jinja
+    - defaults:
+        USERNAME: {{username}}
+
+{%     endif %}
+{%   endif %}
+{% endfor %}
+
 {% else %}
 
 desktop_xwindows_os_fail: