diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f409195918..4a1418c3e1 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -252,6 +252,8 @@ p a {
 		<li>[Fix] Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467)</li>
 		<li>[Fix] Prevent changing postable forum having subforums to link forum without moving subforums out first</li>
 		<li>[Fix] Do not display version in admin template (Bug #13495)</li>
+		<li>[Fix] Allow manual specification of remote avatar dimensions if getimagesize is disabled (Bug #13531)</li>
+
 
 	</ul>
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 8750ca91a0..d9ed7980f2 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1820,13 +1820,13 @@ function avatar_remote($data, &$error)
 	}
 
 	// Make sure getimagesize works...
-	if (($image_data = @getimagesize($data['remotelink'])) === false)
+	if (($image_data = @getimagesize($data['remotelink'])) === false && (empty($data['width']) || empty($data['height'])))
 	{
 		$error[] = $user->lang['UNABLE_GET_IMAGE_SIZE'];
 		return false;
 	}
 
-	if ($image_data[0] < 2 || $image_data[1] < 2)
+	if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
 	{
 		$error[] = $user->lang['AVATAR_NO_SIZE'];
 		return false;
@@ -1846,7 +1846,7 @@ function avatar_remote($data, &$error)
 	$types = fileupload::image_types();
 	$extension = strtolower(filespec::get_extension($data['remotelink']));
 
-	if (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))
+	if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
 	{
 		if (!isset($types[$image_data[2]]))
 		{