diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 7ccb1130f..c2e89f76e 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -298,10 +298,8 @@
         function dispMemberLogout() {
             $oMemberController = &getController('member');
             $oMemberController->procMemberLogout();
-
-            Context::set('layout','none');
-            $this->setTemplatePath($this->module_path.'/tpl');
-            $this->setTemplateFile('logout');
+			$this->setRedirectUrl(getNotEncodedUrl('act', ''));
+			return;
         }
 
         /**
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index c7cde18e5..a59445e4a 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -5,7 +5,7 @@
 </div>
 <h1 class="h1">{$lang->cmd_login}</h1>
 <form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
-	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
 	<ul>
 		<li>
 			<p class="q"><label for="uid">{$lang->user_id}</label></p>