--- kdm/backend/client.c
+++ kdm/backend/client.c
@@ -1135,6 +1135,8 @@
 	env = setEnv( env, "PATH", curuid ? td->userPath : td->systemPath );
 	env = setEnv( env, "SHELL", p->pw_shell );
 	env = setEnv( env, "HOME", p->pw_dir );
+	if (getenv("KDM_AUTOLOGIN"))
+		env = setEnv (env, "KDM_AUTOLOGIN", getenv("KDM_AUTOLOGIN"));
 #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
 	if (krbtkfile[0] != '\0')
 		env = setEnv( env, "KRBTKFILE", krbtkfile );
--- kdm/backend/session.c
+++ kdm/backend/session.c
@@ -566,6 +566,7 @@ ManageSession( struct display *d )
 
 	tdiff = time( 0 ) - td->hstent->lastExit - td->openDelay;
 	if (AutoLogon( tdiff )) {
+ 		setenv("KDM_AUTOLOGIN", curuser, 1);
 		if (!Verify( conv_auto, FALSE ))
 			goto gcont;
 		if (greeter)