diff --git a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
index 320b9cd..3e44b2c 100644
--- a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
+++ b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
@@ -1,2 +1,2 @@
 [org.gnome.Console]
-shell = [ '/usr/bin/vso', 'shell']
+shell = [ '/usr/bin/vso-os-shell']
diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml
index 32be5df..a02a634 100644
--- a/modules/00-vanilla-system-operator.yml
+++ b/modules/00-vanilla-system-operator.yml
@@ -21,6 +21,7 @@ modules:
   commands:
   - chmod +x /usr/bin/vso-os-shell
   - echo "/usr/bin/vso-os-shell" >> /etc/shells
+  - sed -i 's/^\(SHELL=\).*/\1\/usr\/bin\/vso-os-shell/' /etc/default/useradd
 - name: vso-deps-install
   type: apt
   source: