diff --git a/ChangeLog b/ChangeLog
index a6380346b..c82f56b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,7 +35,9 @@
    the LOGIN_CAP case into platform.c.
  - (dtucker) platform.c session.c] Move the USE_LIBIAF fragment into
    platform.c
- - (dtucker) platform.c session.c] Move aix_usrinfo frament into platform.c.
+ - (dtucker) [platform.c session.c] Move aix_usrinfo frament into platform.c.
+ - (dtucker) [platform.c session.c] Move irix setusercontext fragment into
+   platform.c.
 
 20101025
  - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
diff --git a/platform.c b/platform.c
index 97439b574..c8163f901 100644
--- a/platform.c
+++ b/platform.c
@@ -1,4 +1,4 @@
-/* $Id: platform.c,v 1.11 2010/11/05 02:11:04 dtucker Exp $ */
+/* $Id: platform.c,v 1.12 2010/11/05 02:29:25 dtucker Exp $ */
 
 /*
  * Copyright (c) 2006 Darren Tucker.  All rights reserved.
@@ -102,6 +102,11 @@ platform_setusercontext(struct passwd *pw)
 void
 platform_setusercontext_post_groups(struct passwd *pw)
 {
+#if !defined(HAVE_LOGIN_CAP) && (defined(WITH_IRIX_PROJECT) || \
+    defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY))
+	irix_setusercontext(pw);
+#endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */
+
 #ifdef _AIX
 	aix_usrinfo(pw);
 #endif /* _AIX */
diff --git a/session.c b/session.c
index fc712ad93..002cfd844 100644
--- a/session.c
+++ b/session.c
@@ -1510,9 +1510,6 @@ do_setusercontext(struct passwd *pw)
 			do_pam_setcred(use_privsep);
 		}
 # endif /* USE_PAM */
-# if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
-		irix_setusercontext(pw);
-# endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */
 #endif
 
 		platform_setusercontext_post_groups(pw);