diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index e2ed9fac16..bb96ff6829 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -331,15 +331,12 @@ $lang['Stored'] = "Your message has been entered successfully";
 $lang['Deleted'] = "Your message has been deleted successfully";
 $lang['Poll_delete'] = "Your poll has been deleted successfully";
 $lang['Vote_cast'] = "Your vote has been cast";
-$lang['Click'] = "Click"; // Followed by here and then either return to topic or view message
-$lang['Here'] = "Here";
-$lang['to_return_forum'] = "to return to the forum";
-$lang['to_view_message'] = "to view your message";
-$lang['to_return_topic'] = "to return to the topic";
 
 $lang['Click_return_topic'] = "Click %sHere%s to return to the topic";
+$lang['Click_return_login'] = "Click %sHere%s to try again";
 $lang['Click_return_forum'] = "Click %sHere%s to return to the forum";
 $lang['Click_view_message'] = "Click %sHere%s to view your message";
+$lang['Click_return_modcp'] = "Click %sHere%s to return to the Moderator Control Panel";
 
 $lang['Topic_reply_notification'] = "Topic Reply Notification";
 
@@ -678,7 +675,7 @@ $lang['Critical_Error'] = "Critical Error";
 $lang['An_error_occured'] = "An Error Occured";
 $lang['A_critical_error'] = "A Critical Error Occured";
 
-$lang['Error_login'] = "Login Failed<br /><br />You have specified an incorrect or inactive username or an invalid password";
+$lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password";
 
 $lang['Not_Moderator'] = "You are not a moderator of this forum";
 $lang['Not_Authorised'] = "Not Authorised";
diff --git a/phpBB/login.php b/phpBB/login.php
index d725a4ad4b..d7f43fe1e8 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -77,7 +77,15 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
 			}
 			else
 			{
-				message_die(GENERAL_MESSAGE, $lang['Error_login']);
+				$template->assign_vars(array(
+					"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
+				);
+
+				$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
+
+				$message = $lang['Error_login'] . "<br /><br />" . sprintf($lang['Click_return_login'], "<a href=\"" . append_sid("login.$phpEx?$redirect") . "\">", "</a> ") . "<br /><br />" .  sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a> ");
+					
+				message_die(GENERAL_MESSAGE, $message);
 			}
 		}
 		else
diff --git a/phpBB/posting.php b/phpBB/posting.php
index c7ff3301a2..76be0380af 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1065,9 +1065,9 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 								"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id") . '#' . $new_post_id . '">')
 							);
 
-							$msg_die = $lang['Stored'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id") . "#$new_post_id\">" . $lang['Here'] . "</a> " . $lang['to_view_message'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_forum'];
+							$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id") . "#$new_post_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>");
 
-							message_die(GENERAL_MESSAGE, $msg_die);
+							message_die(GENERAL_MESSAGE, $message);
 						}
 						else
 						{
@@ -1117,7 +1117,8 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 			if( $userdata['user_id'] != $row['poster_id'] && !$is_auth['auth_mod'])
 			{
 				$message = ( $delete || $mode == "delete" ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts'];
-				$message .= "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['HERE'] . "</a> ". $lang['to_return_topic'];
+				$message .="<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
+
 				message_die(GENERAL_MESSAGE, $message);
 			}
 		}
@@ -1131,7 +1132,8 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 		//
 		if( ( $delete || $mode == "delete" ) && ( ( $is_auth['auth_delete'] && !$is_last_post_topic && !$is_auth['auth_mod'] ) ) )
 		{
-			$message = $lang['Cannot_delete_replied'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['HERE'] . "</a> ". $lang['to_return_topic'];
+			$message = $lang['Cannot_delete_replied'] . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
+
 			message_die(GENERAL_MESSAGE, $message);
 		}
 		else if( ( $delete || $poll_delete || $mode == "delete" ) && ( ( $is_auth['auth_delete'] && $is_last_post_topic ) || $is_auth['auth_mod'] ) )
@@ -1205,9 +1207,9 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 											"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
 										);
 
-										$msg_die = $lang['Poll_delete'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_topic'];
+										$message = $lang['Poll_delete'] . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
 
-										message_die(GENERAL_MESSAGE, $msg_die);
+										message_die(GENERAL_MESSAGE, $message);
 									}
 									else
 									{
@@ -1232,12 +1234,14 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 				}
 				else if( $post_has_poll && !$can_edit_poll && $poll_delete )
 				{
-					$message = $lang['Cannot_delete_poll'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_topic'];
+					$message = $lang['Cannot_delete_poll'] . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
+
 					message_die(GENERAL_MESSAGE, $message);
 				}
 				else if( !$is_first_post_topic && $poll_delete )
 				{
-					$message = $lang['Post_has_no_poll'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_topic'];
+					$message = $lang['Post_has_no_poll'] . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
+
 					message_die(GENERAL_MESSAGE, $message);
 				}
 
@@ -1380,7 +1384,8 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 											"META" => '<meta http-equiv="refresh" content="3;url= ' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
 										);
 
-										$msg_die .= "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
+										$message .= "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
+
 									}
 									else
 									{
@@ -1388,9 +1393,9 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 											"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
 										);
 									}
-									$msg_die .= "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_forum'];
+									$message .= "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>");
 
-									message_die(GENERAL_MESSAGE, $msg_die);
+									message_die(GENERAL_MESSAGE, $message);
 								}
 								else
 								{
@@ -1590,9 +1595,9 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 								"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . '#' . $post_id . '">')
 							);
 
-							$msg_die = $lang['Stored'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . "#$post_id\">" . $lang['Here'] . "</a> " . $lang['to_view_message'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_forum'];
+							$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . "#$post_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>");
 
-							message_die(GENERAL_MESSAGE, $msg_die);
+							message_die(GENERAL_MESSAGE, $message);
 						}
 						else
 						{
@@ -1615,9 +1620,9 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 							"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . '#' . $post_id . '">')
 						);
 
-						$msg_die = $lang['Stored'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . "#$post_id\">" . $lang['Here'] . "</a> " . $lang['to_view_message'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_forum'];
+						$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . "#$post_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>");
 
-						message_die(GENERAL_MESSAGE, $msg_die);
+						message_die(GENERAL_MESSAGE, $message);
 					}
 					else
 					{
@@ -1661,7 +1666,7 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "= $topic_id") . '">')
 					);
 
-					$message = $lang['No_vote_option'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
+					$message = $lang['No_vote_option'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
 
 					message_die(GENERAL_MESSAGE, $message);
 				}
@@ -1696,7 +1701,7 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 								"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
 							);
 
-							$message = $lang['Vote_cast'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
+							$message = $lang['Vote_cast'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
 
 							message_die(GENERAL_MESSAGE, $message);
 						}
@@ -1725,7 +1730,7 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
 					);
 
-					$message = $lang['Already_voted'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
+					$message = $lang['Already_voted'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
 
 					message_die(GENERAL_MESSAGE, $message);
 				}
@@ -1733,7 +1738,7 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 		}
 		else
 		{
-			$message = $lang['No_vote_option'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
+			$message = $lang['No_vote_option'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
 
 			message_die(GENERAL_MESSAGE, $message);
 		}