diff --git a/ChangeLog b/ChangeLog
index 909b9fc59..6595f6768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,8 @@
    retain previous behavior.
  - (dtucker) [platform.c session.c] Move the PAM credential establishment for
    the LOGIN_CAP case into platform.c.
+ - (dtucker) platform.c session.c] Move the USE_LIBIAF 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 0335eaae6..910e39713 100644
--- a/platform.c
+++ b/platform.c
@@ -1,4 +1,4 @@
-/* $Id: platform.c,v 1.9 2010/11/05 02:00:05 dtucker Exp $ */
+/* $Id: platform.c,v 1.10 2010/11/05 02:07:25 dtucker Exp $ */
 
 /*
  * Copyright (c) 2006 Darren Tucker.  All rights reserved.
@@ -102,6 +102,12 @@ platform_setusercontext(struct passwd *pw)
 void
 platform_setusercontext_post_groups(struct passwd *pw)
 {
+#if !defined(HAVE_LOGIN_CAP) && defined(USE_LIBIAF)
+	if (set_id(pw->pw_name) != 0) {
+		exit(1);
+	}
+# endif /* USE_LIBIAF */
+
 #ifdef HAVE_SETPCRED
 	/*
 	 * If we have a chroot directory, we set all creds except real
diff --git a/session.c b/session.c
index a2d8bec8b..6ef07c407 100644
--- a/session.c
+++ b/session.c
@@ -1516,11 +1516,6 @@ do_setusercontext(struct passwd *pw)
 # ifdef _AIX
 		aix_usrinfo(pw);
 # endif /* _AIX */
-# ifdef USE_LIBIAF
-		if (set_id(pw->pw_name) != 0) {
-			exit(1);
-		}
-# endif /* USE_LIBIAF */
 #endif
 
 		platform_setusercontext_post_groups(pw);