diff --git a/phpBB/includes/ucp/ucp_auth_link.php b/phpBB/includes/ucp/ucp_auth_link.php
index 4fa984c9e7..ed348609cf 100644
--- a/phpBB/includes/ucp/ucp_auth_link.php
+++ b/phpBB/includes/ucp/ucp_auth_link.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package notifications
+* @package ucp
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php
index 4173c54c42..bf7df1d4eb 100644
--- a/phpBB/includes/ucp/ucp_login_link.php
+++ b/phpBB/includes/ucp/ucp_login_link.php
@@ -155,12 +155,13 @@ class ucp_login_link
 
 		$var_names = $request->variable_names(phpbb_request_interface::GET);
 		$login_link_data = array();
+		$string_start_length = strlen('login_link_');
 
 		foreach ($var_names as $var_name)
 		{
 			if (strpos($var_name, 'login_link_') === 0)
 			{
-				$key_name = str_replace('login_link_', '', $var_name);
+				$key_name = substr($var_name, $string_start_length);
 				$login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::GET);
 			}
 		}