diff --git a/config/func.inc.php b/config/func.inc.php
index f47e5b978..06434d2c5 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -471,6 +471,18 @@ function getFullSiteUrl()
 	return $url;
 }
 
+/**
+ * Return the exact url of the current page
+ *
+ * @return string
+ */
+function getCurrentPageUrl()
+{
+	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
+	$url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
+}
+
 /**
  * Return if domain of the virtual site is url type or id type
  *
diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html
index dc38c065b..6a9e38cff 100644
--- a/layouts/xedition/layout.html
+++ b/layouts/xedition/layout.html
@@ -448,9 +448,9 @@
 			<h1>LOGIN</h1>
 		</div>
 		<div class="login-body">
-			<form action="{getUrl()}" method="post" autocomplete="off">
+			<form action="{getUrl('', 'act', 'procMemberLogin')}" method="post" autocomplete="off">
 				<input type="hidden" name="act" value="procMemberLogin" />
-				<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE)}" />
+				<input type="hidden" name="success_return_url" value="{getCurrentPageUrl()}" />
 				<input type="hidden" name="xe_validator_id" value="layouts/xedition/layout/1" />
 				<fieldset>
 					<legend class="blind">{$lang->cmd_login}</legend>