diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 6d915d8e2..6163b5473 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -17,7 +17,8 @@
  - Bugfix [ 938211 ] FIX: DeleteExpiredEvents.pm ignores offset
  - Bugfix [ 951061 ] Login from AOL
  - Bugfix [ 956219 ] can't delete survey question
-
+ - Fixed a bug whhere after posting to a USS you were redirected to the forum
+   for your new submission.
 
 
 
diff --git a/lib/WebGUI/Forum/UI.pm b/lib/WebGUI/Forum/UI.pm
index c3479e894..3c52a239b 100644
--- a/lib/WebGUI/Forum/UI.pm
+++ b/lib/WebGUI/Forum/UI.pm
@@ -1959,7 +1959,8 @@ sub www_postSave {
 			}, \%postData);
 		$thread->subscribe($session{user}{userId}) if ($session{form}{subscribe});
 		setPostStatus($caller,$thread->getPost($thread->get("rootPostId")));
-		return www_viewForum($caller, $forumId);
+		$session{header}{redirect} = WebGUI::Session::httpRedirect(formatForumURL($caller->{callback}, $forumId));
+		return "";
 	}
 }
 
@@ -2289,12 +2290,6 @@ sub www_viewForum {
 	my ($caller, $forumId) = @_;
 	WebGUI::Session::setScratch("forumSortBy",$session{form}{sortBy});
 	$forumId = $session{form}{forumId} unless ($forumId);
-	# if POST, cause redirect, so new post is displayed using GET instead of POST
-	if ($session{env}{REQUEST_METHOD} =~ /POST/i) {
-		my $url= formatForumURL($caller->{callback}, $forumId);
-		$session{header}{redirect} = WebGUI::Session::httpRedirect($url);
-		return "";
-	}
 	my $forum = WebGUI::Forum->new($forumId);
 	return WebGUI::Privilege::insufficient() unless ($forum->canView);
 	my $var = getForumTemplateVars($caller, $forum);
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index 77443d2ea..0370e64d9 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -808,7 +808,7 @@ sub www_viewSubmission {
                 ($submission->{userId} == $session{user}{userId} && $session{user}{userId} != 1) ||
                 WebGUI::Privilege::isInGroup($_[0]->getValue("groupToApprove")));
 	my $callback = WebGUI::URL::page("func=viewSubmission&wid=".$_[0]->get("wobjectId")."&sid=".$submission->{USS_submissionId});
-	if ($session{form}{forumOp}) {	
+	if ($session{form}{forumOp} ne "" && $session{form}{forumOp} ne "viewForum") {	
 		return WebGUI::Forum::UI::forumOp({
 			callback=>$callback,
 			title=>$submission->{title},