diff --git a/themes/default/htdocs/article.pl b/themes/default/htdocs/article.pl
index c9e1a4fd4..2f6839bbc 100755
--- a/themes/default/htdocs/article.pl
+++ b/themes/default/htdocs/article.pl
@@ -161,7 +161,13 @@ sub main {
 		}
 		
 		my $return_url ="";
-		$return_url = "//".$ENV{HTTP_HOST}.$ENV{REQUEST_URI} unless $form->{cchp};
+		my $redirect = '';
+		$redirect = $redirect."&threshold=".$form->{threshold} if defined($form->{threshold});
+		$redirect = $redirect."&highlightthresh=".$form->{highlightthresh} if defined($form->{highlightthresh});
+		$redirect = $redirect."&commentsort=".$form->{commentsort} if defined($form->{commentsort});
+		$redirect = $redirect."&mode=".$form->{mode} if ($form->{mode});
+		$redirect = $redirect."&noupdate=1";
+		$return_url = $gSkin->{rootdir} . "/article.pl?sid=" . $sid . $redirect unless $form->{cchp};
 		
 		slashDisplay('display', {
 			poll			=> $pollbooth,
diff --git a/themes/default/htdocs/index.pl b/themes/default/htdocs/index.pl
index 3f085c4d2..4f8c0669d 100755
--- a/themes/default/htdocs/index.pl
+++ b/themes/default/htdocs/index.pl
@@ -304,7 +304,7 @@ sub main {
 		my $metamod_reader = getObject('Slash::Metamod', { db_type => 'reader' });
 		$metamod_elig = $metamod_reader->metamodEligible($user);
 	}
-	my $return_url = "//".$ENV{HTTP_HOST}.$ENV{REQUEST_URI};
+	my $return_url = $gSkin->{rootdir};
 	
 	slashDisplay('index', {
 		metamod_elig	=> $metamod_elig,
diff --git a/themes/default/templates/userlogin;misc;default b/themes/default/templates/userlogin;misc;default
index 2d58c1600..85e65f459 100644
--- a/themes/default/templates/userlogin;misc;default
+++ b/themes/default/templates/userlogin;misc;default
@@ -15,7 +15,7 @@ userlogin
 __template__
 
 [%# we log in via main ("real") rootdir, return to current rootdir %]
-[% IF !return_url; return_url = gSkin.rootdir _ '/'; END %]
+[% IF !return_url; return_url = gSkin.rootdir; END %]
 <form action="[% constants.real_rootdir %]/login.pl" method="post">
 <fieldset>
 	<legend>Log In</legend>