Index: src/java/org/sakaiproject/site/tool/SiteAction.java
===================================================================
--- src/java/org/sakaiproject/site/tool/SiteAction.java	(revision 114465)
+++ src/java/org/sakaiproject/site/tool/SiteAction.java	(working copy)
@@ -2646,10 +2646,9 @@
 				if (state.getAttribute(STATE_MANUAL_ADD_COURSE_NUMBER) != null) {
 					context.put("selectedManualCourse", Boolean.TRUE);
 				}
+			
 				context.put("term", (AcademicSession) state
 						.getAttribute(STATE_TERM_SELECTED));
-				context.put("currentUserId", (String) state
-						.getAttribute(STATE_CM_CURRENT_USERID));
 				context.put("form_additional", (String) state
 						.getAttribute(FORM_ADDITIONAL));
 				context.put("authorizers", getAuthorizers(state, STATE_CM_AUTHORIZER_LIST));
@@ -2667,7 +2666,12 @@
 
 			// added for 2.4 -daisyf
 			context.put("campusDirectory", getCampusDirectory());
-			context.put("userId", state.getAttribute(STATE_INSTRUCTOR_SELECTED) != null ? (String) state.getAttribute(STATE_INSTRUCTOR_SELECTED) : UserDirectoryService.getCurrentUser().getId());
+			
+			// SAK-22787 make sure this sets the eid so it matches the other values that are set.
+			context.put("userId", state.getAttribute(STATE_INSTRUCTOR_SELECTED) != null ? (String) state.getAttribute(STATE_INSTRUCTOR_SELECTED) : UserDirectoryService.getCurrentUser().getEid());
+			
+			// SAK-22787 - move this out of all conditionals so its always set
+			context.put("currentUserId", (String) state.getAttribute(STATE_CM_CURRENT_USERID));
 			/*
 			 * for measuring how long it takes to load sections java.util.Date
 			 * date = new java.util.Date(); M_log.debug("***2. finish at: