Index: index.php
===================================================================
--- index.php	(revision 10057)
+++ index.php	(working copy)
@@ -120,7 +120,6 @@
 	'FORUM_LOCKED_IMG'		=> $user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'),
 	'FORUM_NEW_LOCKED_IMG'	=> $user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'),
 
-	'S_LOGIN_ACTION'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'),
 	'S_DISPLAY_BIRTHDAY_LIST'	=> ($config['load_birthdays']) ? true : false,
 
 	'U_MARK_FORUMS'		=> ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums') : '',
Index: includes/functions.php
===================================================================
--- includes/functions.php	(revision 10057)
+++ includes/functions.php	(working copy)
@@ -2820,6 +2820,9 @@
 {
 	global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config;
 
+	// We're in the login box
+	define('IN_LOGIN_BOX', true);
+	
 	if (!class_exists('phpbb_captcha_factory'))
 	{
 		include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
@@ -4223,6 +4226,11 @@
 
 		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
 	));
+	
+	if (!defined('IN_LOGIN_BOX'))
+	{
+		$template->assign_var('S_LOGIN_ACTION', append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'));
+	}
 
 	// application/xhtml+xml not used because of IE
 	header('Content-type: text/html; charset=UTF-8');