diff --git a/plugins/passwordResetPlugin/passwordResetPlugin.php b/plugins/passwordResetPlugin/passwordResetPlugin.php
index c15f156..0c78881 100644
--- a/plugins/passwordResetPlugin/passwordResetPlugin.php
+++ b/plugins/passwordResetPlugin/passwordResetPlugin.php
@@ -54,10 +54,12 @@ class PasswordResetInterceptor extends KTInterceptor {
 	    $oRegistry =& KTPluginRegistry::getSingleton();
 	    $oPlugin =& $oRegistry->getPlugin('password.reset.plugin');
         $dispatcherURL = $oPlugin->getURLPath('loginResetDispatcher.php');
+        $queryString = $_SERVER['QUERY_STRING'];
         $redirect = KTUtil::arrayGet($_REQUEST, 'redirect');
+        $redirect = urlencode($redirect);
 
         $url = KTUtil::kt_url() . $dispatcherURL;
-        $url .= (!empty($redirect)) ? '?redirect='.$redirect : '';
+        $url .= (!empty($queryString)) ? '?'.$queryString : '';
         redirect($url);
         exit(0);
 	}