Improved fix for XNAT-4522.

src/main/java/org/nrg/xnat/security/DisableInactiveUsers.java

@@ -68,7 +68,7 @@ public class DisableInactiveUsers implements Runnable {
                     if (!hasUserBeenModified(u, _inactivityBeforeLockout) && !username.equals("guest")) {
                         u.setEnabled("0");
                         u.setVerified("0");
-                        Users.save(u, adminUser, false, EventUtils.newEventInstance(EventUtils.CATEGORY.SIDE_ADMIN, EventUtils.TYPE.PROCESS, "Disabled due to inactivity"));
+                        Users.save(u, u, false, EventUtils.newEventInstance(EventUtils.CATEGORY.SIDE_ADMIN, EventUtils.TYPE.PROCESS, "Disabled due to inactivity"));
 
                         String expiration = TurbineUtils.getDateTimeFormatter().format(DateUtils.addMilliseconds(GregorianCalendar.getInstance().getTime(), _lockoutDuration));
                         System.out.println("Locked out " + u.getLogin() + " user account until " + expiration);

src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java

@@ -135,7 +135,7 @@ public class XnatDatabaseAuthenticationProvider extends DaoAuthenticationProvide
                     String query = "SELECT COUNT(*) AS count " +
                             "FROM xdat_user_history " +
                             "WHERE xdat_user_id=" + xdatUserDetails.getID() + " " +
-                            //"AND change_user=" + xdatUserDetails.getID() + " " +
+                            "AND change_user=" + xdatUserDetails.getID() + " " +
                             "AND change_date = (SELECT MAX(change_date) " +
                             "FROM xdat_user_history " +
                             "WHERE xdat_user_id=" + xdatUserDetails.getID() + " " +