diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b14f03f5a0..02cdfd7ed1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3373,12 +3373,9 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 	{
 		$auth_provider = $phpbb_container->get('auth.provider.oauth');
 		$oauth_box_data = $auth_provider->get_login_data();
-		foreach ($oauth_box_data as $service_name => $data)
+		foreach ($oauth_box_data as $data)
 		{
-			$template->assign_block_vars('oauth', array(
-				'SERVICE_NAME'	=> $service_name,
-				'REDIRECT_URL'	=> $data['url'],
-			));
+			$template->assign_block_vars('oauth', $data);
 		}
 	}
 
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 6e822101e3..0762e202db 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -272,11 +272,12 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 			$credentials = $service_provider->get_service_credentials();
 			if ($credentials['key'] && $credentials['secret'])
 			{
-				$login_data[$service_provider] = array();
-
-				// Build the redirect url for the box
-				$redirect_url = build_url(false) . '&oauth_service=' . $service_name;
-				$login_data[$service_provider]['url'] = redirect($redirect_url, true);
+				$actual_name = str_replace('auth.provider.oauth.service.', '', $service_name);
+				$redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name;
+				$login_data[$service_name] = array(
+					'REDIRECT_URL'	=> redirect($redirect_url, true),
+					'SERVICE_NAME'	=> $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],
+				);
 			}
 		}