diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index c2bf13f70..703b245f1 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -93,7 +93,6 @@ sub contentHandler {
 	} elsif ($session->setting->get("specialState") eq "upgrading") {
 		upgrading($session);
 	} else {
-		$r->user($session->user->username); # Tell Apache who's getting this page
 		my $output = processOperations($session);
 		if ($output ne "") {
 			# do nothing because we have operation output to display
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 00a7669aa..431e9fa51 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -587,10 +587,12 @@ sub user {
 		}	
 		delete $self->{_stow};
 		$self->{_user} = $option->{user} || WebGUI::User->new($self, $userId);
+		$self->request->user($self->{_user}->username);
 	} elsif (!exists $self->{_user}) {
 		$self->{_user} = WebGUI::User->new($self, $self->var->get('userId'));
-	}
-	return $self->{_user};
+		$self->request->user($self->{_user}->username);
+	} 
+    	return $self->{_user};
 }