diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 88849c7a2..7e40316b2 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -64,16 +64,18 @@ sub contentHandler {
         }
 
 	WebGUI::Session::open($s->dir_config('WebguiRoot'),$r->dir_config('WebguiConfig'),$r);
+	###----------------------------
+	### Apache2::Request object
+	$session{req} = Apache2::Request->new($r, POST_MAX => 1024 * $session{setting}{maxAttachmentSize});        
+
+	# Add wgSession cookie to header
+	WebGUI::HTTP::setCookie("wgSession",$session{var}{sessionId});
 	### Add Apache Request stuff to Session
 	$session{wguri} = $r->uri;
 	### check to see if client is proxied and adjust remote_addr as necessary
 	if ($ENV{HTTP_X_FORWARDED_FOR} ne "") {
 		$session{env}{REMOTE_ADDR} = $ENV{HTTP_X_FORWARDED_FOR};
 	}
-	###----------------------------
-	### Apache2::Request object
-	$session{req} = Apache2::Request->new($r, POST_MAX => 1024 * $session{setting}{maxAttachmentSize});
-	###----------------------------
 	### form variables
 	#
 	foreach ($session{req}->param) {
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 1d2e4a902..1d942ea2a 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -428,8 +428,6 @@ sub start {
 	$sessionId = $_[1] || _uniqueSessionId();
 	WebGUI::SQL->write("insert into userSession values ('$sessionId', ".
 		(time()+$session{setting}{sessionTimeout}).", ".time().", 0, '$ENV{REMOTE_ADDR}', ".quote($_[0]).")");
-	require WebGUI::HTTP;
-	WebGUI::HTTP::setCookie("wgSession",$sessionId);
 	refreshSessionVars($sessionId);
 	return $sessionId;
 }