Index: ubuntu/src/sulogin.c
===================================================================
--- ubuntu.orig/src/sulogin.c
+++ ubuntu/src/sulogin.c
@@ -57,7 +57,8 @@
 #define F_PASSWD	"/etc/passwd"
 #define F_SHADOW	"/etc/shadow"
 #define BINSH		"/bin/sh"
-#define STATICSH	"/bin/sash"
+#define STATICSH	"/bin/static-sh"
+#define STATICSH_SASH	"/bin/sash"
 
 char *Version = "@(#)sulogin 2.85-3 23-Apr-2003 miquels@cistron.nl";
 
@@ -469,6 +470,11 @@
 	setenv("SHELL", STATICSH, 1);
 	execl(STATICSH, STATICSH, NULL);
 	perror(STATICSH);
+
+	/* Fall back to sash */
+	setenv("SHELL", STATICSH_SASH, 1);
+	execl(STATICSH_SASH, STATICSH_SASH, NULL);
+	perror(STATICSH_SASH);
 }
 
 static
