--- gdm-2.29.4/daemon/gdm-slave.c-orig	2010-01-11 21:38:07.765253118 -0600
+++ gdm-2.29.4/daemon/gdm-slave.c	2010-01-11 21:39:59.295323930 -0600
@@ -238,9 +238,7 @@ get_script_environment (GdmSlave   *slav
         /* Runs as root */
         g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));
         g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));
-
-        /*g_setenv ("PATH", gdm_daemon_config_get_value_string (GDM_KEY_ROOT_PATH), TRUE);*/
-
+        g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH));
         g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
 
         g_hash_table_remove (hash, "MAIL");
--- gdm-2.29.4/daemon/gdm-simple-slave.c-orig	2010-01-11 21:37:54.379964683 -0600
+++ gdm-2.29.4/daemon/gdm-simple-slave.c	2010-01-11 21:40:19.310473406 -0600
@@ -339,6 +339,8 @@ try_migrate_session (GdmSimpleSlave *sla
 static void
 stop_greeter (GdmSimpleSlave *slave)
 {
+        char *username;
+
         g_debug ("GdmSimpleSlave: Stopping greeter");
 
         if (slave->priv->greeter == NULL) {
@@ -347,7 +349,8 @@ stop_greeter (GdmSimpleSlave *slave)
         }
 
         /* Run the PostLogin script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", GDM_USERNAME);
+        username = gdm_session_direct_get_username (slave->priv->session);
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", username);
 
         gdm_welcome_session_stop (GDM_WELCOME_SESSION (slave->priv->greeter));
         gdm_greeter_server_stop (slave->priv->greeter_server);
--- gdm-2.29.4/data/PreSession.in-orig	2010-01-11 21:37:07.671167115 -0600
+++ gdm-2.29.4/data/PreSession.in	2010-01-11 21:37:14.064021247 -0600
@@ -6,4 +6,4 @@
 #
 # Note that output goes into the .xsession-errors file for easy debugging
 #
-PATH="@X_PATH@:$PATH:/bin:/usr/bin"
+PATH="@X_PATH@:$PATH"
--- gdm-2.29.4/data/Init.in-orig	2010-01-11 22:01:48.856574548 -0600
+++ gdm-2.29.4/data/Init.in	2010-01-11 22:01:54.483049132 -0600
@@ -3,7 +3,7 @@
 # Plus a lot of fun stuff added
 #  -George
 
-PATH=@X_PATH@:$PATH
+PATH="@X_PATH@:$PATH"
 OLD_IFS=$IFS
 
 gdmwhich () {
