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/packages.sls b/salt/desktop/packages.sls
index 3b0d4c8ba..5c0121e7b 100644
--- a/salt/desktop/packages.sls
+++ b/salt/desktop/packages.sls
@@ -349,6 +349,7 @@ desktop_packages:
       - snappy
       - sound-theme-freedesktop
       - soundtouch
+      - securityonion-networkminer
       - speech-dispatcher
       - speech-dispatcher-espeak-ng
       - speex
diff --git a/salt/desktop/scripts/convert-gnome-classic.sh b/salt/desktop/scripts/convert-gnome-classic.sh
new file mode 100644
index 000000000..e69a43b2d
--- /dev/null
+++ b/salt/desktop/scripts/convert-gnome-classic.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "Setting default session to gnome-classic"
+cp /usr/share/accountsservice/user-templates/standard /etc/accountsservice/user-templates/
+sed -i 's|Session=gnome|Session=gnome-classic|g' /etc/accountsservice/user-templates/standard
diff --git a/salt/desktop/xwindows.sls b/salt/desktop/xwindows.sls
index ea0c7df4f..c7790f9f4 100644
--- a/salt/desktop/xwindows.sls
+++ b/salt/desktop/xwindows.sls
@@ -14,6 +14,27 @@ graphical_target:
     - require:
       - desktop_packages
 
+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: