Index: course/loginas.php
===================================================================
--- course/loginas.php	(revision 929)
+++ course/loginas.php	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// Allows a teacher/admin to login as another user (in stealth mode)
+// Allows a teacher/admin to login as another user
 
 require_once('../config.php');
 require_once('lib.php');
@@ -60,11 +60,10 @@
 }
 
 /// Login as this user and return to course home page.
-$oldfullname = fullname($USER, true);
 session_loginas($userid, $context);
 $newfullname = fullname($USER, true);
 
-add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&amp;user=$userid", "$oldfullname -> $newfullname");
+add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&amp;user=$userid", 'userid: ' . session_get_realuser()->id);
 
 $strloginas    = get_string('loginas');
 $strloggedinas = get_string('loggedinas', '', $newfullname);
Index: lib/datalib.php
===================================================================
--- lib/datalib.php	(revision 929)
+++ lib/datalib.php	(working copy)
@@ -1640,14 +1640,17 @@
     if ($cm === '' || is_null($cm)) { // postgres won't translate empty string to its default
         $cm = 0;
     }
-
+	$loginasinfo = '';
     if ($user) {
         $userid = $user;
     } else {
-        if (session_is_loggedinas()) {  // Don't log
-            return;
+		if (session_is_loggedinas()) {
+			$userid = session_get_realuser()->id;
+            $loginasinfo = " | logged as userid: $USER->id";
+        }else{
+			$userid = empty($USER->id) ? '0' : $USER->id;
         }
-        $userid = empty($USER->id) ? '0' : $USER->id;
+        
     }
 
     if (isset($CFG->logguests) and !$CFG->logguests) {
@@ -1659,7 +1662,7 @@
     $REMOTE_ADDR = getremoteaddr();
 
     $timenow = time();
-    $info = $info;
+    $info = $info . $loginasinfo;
     if (!empty($url)) { // could break doing html_entity_decode on an empty var.
         $url = html_entity_decode($url);
     } else {
Index: lib/moodlelib.php
===================================================================
--- lib/moodlelib.php	(revision 929)
+++ lib/moodlelib.php	(working copy)
@@ -2650,7 +2650,13 @@
     $params = $USER;
 
     if (isloggedin()) {
+		if (session_is_loggedinas()) {
+			$userid = session_get_realuser()->id;
+			add_to_log(SITEID, "user", "logoutas", "view.php?id=$userid&course=".SITEID, "userid: $userid | ended to be logged as userid: $USER->id", 0, $userid);
+		}else{
         add_to_log(SITEID, "user", "logout", "view.php?id=$USER->id&course=".SITEID, $USER->id, 0, $USER->id);
+		}
+		
 
         $authsequence = get_enabled_auth_plugins(); // auths, in sequence
         foreach($authsequence as $authname) {