diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 9b617dd7a..6104e27f1 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -559,9 +559,7 @@
             }
             // Log-in
             if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
-            //get redirect url from cookie and invalidate cookie
-            $config->redirect_url = $_COOKIE["XE_REDIRECT_URL"];
-            setcookie("XE_REDIRECT_URL", '', 1);
+
             // Results
             $this->add('member_srl', $args->member_srl);
             if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
@@ -574,9 +572,18 @@
             $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
             if(!$trigger_output->toBool()) return $trigger_output;
 
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
-				header('location:'.$returnUrl);
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+			{
+				if($config->redirect_url)
+				{
+					$returnUrl = $config->redirect_url;
+				}
+				else
+				{
+					$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				}
+
+				$this->setRedirectUrl = $returnUrl;
 				return;
 			}
         }
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 4c03dd78a..040313463 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -90,10 +90,6 @@
          * @brief Display member join form
          **/
         function dispMemberSignUpForm() {
-        	//setcookie for redirect url in case of going to member sign up
-            if (!isset($_COOKIE["XE_REDIRECT_URL"]))
-			setcookie("XE_REDIRECT_URL", $_SERVER['HTTP_REFERER']);
-			
             $oMemberModel = &getModel('member');
             // Get the member information if logged-in
             if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
diff --git a/modules/message/message.view.php b/modules/message/message.view.php
index 015307c49..0c3f56036 100644
--- a/modules/message/message.view.php
+++ b/modules/message/message.view.php
@@ -17,8 +17,6 @@
          * @brief Display messages
          **/
         function dispMessage() {
-        	//setcookie for redirect url in case of going to member sign up
-        	setcookie("XE_REDIRECT_URL", $_SERVER['REQUEST_URI']);
             // Get configurations (using module model object)
             $oModuleModel = &getModel('module');
             $this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl);