diff --git a/op/op.SubstituteUser.php b/op/op.SubstituteUser.php
index b47f286f2..9e366de98 100644
--- a/op/op.SubstituteUser.php
+++ b/op/op.SubstituteUser.php
@@ -44,6 +44,14 @@ $session->setSu($_GET['userid']);
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_substituted_user')));
 
 add_log_line("?userid=".$_GET["userid"]);
-header("Location: ../".(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".$settings->_rootFolderID));
+
+$newuser = $dms->getUser($_GET["userid"]);
+
+if (isset($referuri) && strlen($referuri)>0) {
+	header("Location: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'] . $referuri);
+}
+else {
+	header("Location: ".$settings->_httpRoot.(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".($newuser->getHomeFolder() ? $newuser->getHomeFolder() : $settings->_rootFolderID)));
+}
 
 ?>