Index: styles/subsilver2/template/login_body.html
===================================================================
--- styles/subsilver2/template/login_body.html	(revision 10057)
+++ styles/subsilver2/template/login_body.html	(working copy)
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_LOGIN_ACTION}" method="post">
+<form action="{S_LOGIN_BOX_ACTION}" method="post">
 
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
Index: styles/prosilver/template/login_body.html
===================================================================
--- styles/prosilver/template/login_body.html	(revision 10057)
+++ styles/prosilver/template/login_body.html	(working copy)
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_LOGIN_ACTION}" method="post" id="login">
+<form action="{S_LOGIN_BOX_ACTION}" method="post" id="login">
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
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') . '&amp;mark=forums') : '',
Index: includes/functions.php
===================================================================
--- includes/functions.php	(revision 10057)
+++ includes/functions.php	(working copy)
@@ -2819,7 +2819,7 @@
 function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true)
 {
 	global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config;
-
+	
 	if (!class_exists('phpbb_captcha_factory'))
 	{
 		include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
@@ -3009,7 +3009,7 @@
 		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
 
 		'S_DISPLAY_FULL_LOGIN'	=> ($s_display) ? true : false,
-		'S_LOGIN_ACTION'		=> (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
+		'S_LOGIN_BOX_ACTION'	=> (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
 		'S_HIDDEN_FIELDS' 		=> $s_hidden_fields,
 
 		'S_ADMIN_AUTH'			=> $admin,
@@ -4185,6 +4185,7 @@
 		'S_REGISTER_ENABLED'	=> ($config['require_activation'] != USER_ACTIVATION_DISABLE) ? true : false,
 		'S_FORUM_ID'			=> $forum_id,
 		'S_TOPIC_ID'			=> $topic_id,
+		'S_LOGIN_ACTION'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'),
 
 		'S_ENABLE_FEEDS'			=> ($config['feed_enable']) ? true : false,
 		'S_ENABLE_FEEDS_FORUMS'		=> ($config['feed_overall_forums']) ? true : false,