diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 985b5e8ca3..fca3ddf403 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2848,7 +2848,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		trigger_error('NO_AUTH_ADMIN');
 	}
 
-	if (($request->is_set_post('login') || ($request->is_set('login') && $request->variable('login', '') == 'external')) && !$err)
+	if (empty($err) && ($request->is_set_post('login') || ($request->is_set('login') && $request->variable('login', '') == 'external')))
 	{
 		// Get credential
 		if ($admin)