diff --git a/phpBB/profile.php b/phpBB/profile.php
index 4b5f6c15ab..24c87afb05 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -535,6 +535,8 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 
 				$user_lang = stripslashes($user_lang);
 				$user_dateformat = stripslashes($user_dateformat);
+				$user_avatar = $user_avatar_local;
+				$user_avatar_type = USER_AVATAR_GALLERY;
 			}
 		}