diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 1ed458a9a..30ca15239 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1435,7 +1435,7 @@ class Context
 		{
 			return;
 		}
-		elseif (self::get('act') === 'procMemberLogin')
+		elseif (in_array(self::get('act'), array('procMemberLogin', 'dispMemberLogout')))
 		{
 			return;
 		}
@@ -1455,6 +1455,7 @@ class Context
 		define('_XE_SITELOCK_', TRUE);
 		define('_XE_SITELOCK_TITLE_', config('lock.title'));
 		define('_XE_SITELOCK_MESSAGE_', config('lock.message'));
+		unset($_SESSION['XE_VALIDATOR_RETURN_URL']);
 		
 		// Load the sitelock template.
 		if(FileHandler::exists(RX_BASEDIR . 'common/tpl/sitelock.user.html'))
diff --git a/modules/message/skins/xedition/system_message.html b/modules/message/skins/xedition/system_message.html
index 060154fef..00032765a 100644
--- a/modules/message/skins/xedition/system_message.html
+++ b/modules/message/skins/xedition/system_message.html
@@ -44,6 +44,9 @@
 	<div cond="$is_logged">
 		<div class="login-body">
 			<p><a class="button" href="{getUrl()}">{$lang->cmd_back}</a></p>
-		</p>
+		</div>
+		<div class="login-footer">
+			<a href="{getUrl('', 'act', 'dispMemberLogout')}">{$lang->cmd_logout}</a>
+		</div>
 	</div>
 </div>