diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index c821265542..9a2d691670 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -380,6 +380,8 @@ if ( isset($HTTP_POST_VARS['submit']) )
 		rawurlencode($website);
 	}
 
+	$avatar_sql = '';
+
 	if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
 	{
 		$avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
@@ -416,10 +418,6 @@ if ( isset($HTTP_POST_VARS['submit']) )
 		}
 		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
 	}
-	else
-	{
-		$avatar_sql = '';
-	}
 
 	if ( !$error )
 	{