Fixes for bug #8380.  It now works properly again.  There was a bug that caused it to be confused as to who was logged in.