Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as
===================================================================
diff -u -r37f2fc4422b5487b4e692e70010e909a509a3a3f -rd794176280daba3e39a2063865cbec9012662b89
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as	(.../WizardManager.as)	(revision 37f2fc4422b5487b4e692e70010e909a509a3a3f)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as	(.../WizardManager.as)	(revision d794176280daba3e39a2063865cbec9012662b89)
@@ -45,7 +45,7 @@
         	_dictionaryRegistry = new XMLDictionaryRegistry(new XML());
         	
         	setLearners(new ArrayCollection());
-        	setStaff(new ArrayCollection());
+        	setStaff(new ArrayCollection(), 0);
         	
         	_lessonInstances = new Array();
         	
@@ -164,9 +164,15 @@
 			dispatchEvent(new Event("learnersChanged"));
 		}
 		
-		public function setStaff(newStaff:ArrayCollection):void {
+		public function setStaff(newStaff:ArrayCollection, userId:uint):void {
 			_staff = newStaff;
 			
+			for each(var staff:Object in _staff) {
+				if (staff.userID == userId) {
+					staff.isCurrentUser = true;
+				}
+			}
+			
 			dispatchEvent(new Event("staffChanged"));
 		}
 		
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
diff -u -r43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734 -rd794176280daba3e39a2063865cbec9012662b89
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision d794176280daba3e39a2063865cbec9012662b89)
@@ -110,7 +110,7 @@
 			<resultHandlers>
 				<MethodInvoker generator="{WDDXParser}" 
 					method="parseObject" arguments="{resultObject}" />
-				<MethodInvoker generator="{WizardManager}" method="setStaff" arguments="{[lastReturn]}" />
+				<MethodInvoker generator="{WizardManager}" method="setStaff" arguments="{[lastReturn, userID]}" />
 			</resultHandlers>
 		</HTTPServiceInvoker>
 	</EventHandlers>
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml
===================================================================
diff -u -r6710ffa47b5b99cb033f76dc5df2cc729cd34ce0 -rd794176280daba3e39a2063865cbec9012662b89
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml	(.../Learners.mxml)	(revision 6710ffa47b5b99cb033f76dc5df2cc729cd34ce0)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml	(.../Learners.mxml)	(revision d794176280daba3e39a2063865cbec9012662b89)
@@ -92,7 +92,7 @@
    				}
    				
    				for each(var staff:Object in staffUnselected) {
-   					if(staff.userID == 4) {
+   					if(staff.isCurrentUser == true) {
    						staffSelected = new ArrayCollection([staff]);
    						staffUnselected.removeItemAt(staffUnselected.getItemIndex(staff));
    						return;