diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js
index 665643c0..91913505 100644
--- a/assets/js/um-scripts.js
+++ b/assets/js/um-scripts.js
@@ -1,3 +1,7 @@
+/*jQuery('body').on('error', '.um-avatar', function() {
+	if( jQuery(this).data('load-error') != undefined ) return;
+	jQuery(this).data('load-error', '1').attr('src', jQuery(this).data('default'));
+});*/
 jQuery(document).ready(function() {
 
 	jQuery(document).on('click', '.um-dropdown a', function(e){
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index 7a787b39..d15afc67 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1761,7 +1761,7 @@ function um_get_user_avatar_data( $user_id = '', $size = '96' ) {
     $data = array(
         'user_id' => $user_id,
         'default' => um_get_default_avatar_uri(),
-        'class' => 'func-um_user gravatar avatar avatar-' . $size . ' um-avatar',
+        'class' => 'gravatar avatar avatar-' . $size . ' um-avatar',
         'size' => $size
     );
 
@@ -2154,7 +2154,8 @@ function um_user( $data, $attrs = null ) {
 			    width="' . esc_attr($data['size']) . '"  
 			    height="' . esc_attr($data['size']) . '" 
 			    alt="' . esc_attr($data['alt']) . '"
-			    onerror="this.src=\''.esc_attr($data['default']).'\';" />'; //don't move attribute before src
+			    data-default="' . esc_attr($data['default']) . '"
+			    onerror="if(!this.getAttribute(\'data-load-error\')){this.setAttribute(\'data-load-error\', \'1\');this.setAttribute(\'src\', this.getAttribute(\'data-default\'));}" />'; //don't move attribute before src
 
 			break;