diff --git a/includes/core/um-filters-avatars.php b/includes/core/um-filters-avatars.php
index f4268af4..12aec65c 100644
--- a/includes/core/um-filters-avatars.php
+++ b/includes/core/um-filters-avatars.php
@@ -27,7 +27,6 @@ add_filter( 'avatar_defaults', 'um_avatar_defaults', 99999 );
  * @return string returns avatar in image html elements
  */
 function um_get_avatar( $avatar = '', $id_or_email='', $size = '96', $avatar_class = '', $default = '', $alt = '' ) {
-
 	if ( is_numeric($id_or_email) )
 		$user_id = (int) $id_or_email;
 	elseif ( is_string( $id_or_email ) && ( $user = get_user_by( 'email', $id_or_email ) ) )
@@ -41,64 +40,6 @@ function um_get_avatar( $avatar = '', $id_or_email='', $size = '96', $avatar_cla
 
 	$avatar = um_user('profile_photo', $size);
 
-	/**
-	 * UM hook
-	 *
-	 * @type filter
-	 * @title um_avatar_image_alternate_text
-	 * @description Change avatar image alt
-	 * @input_vars
-	 * [{"var":"$avatar_alt","type":"string","desc":"Image alternate text. Display name by default"}]
-	 * @change_log
-	 * ["Since: 2.0"]
-	 * @usage
-	 * <?php add_filter( 'um_avatar_image_alternate_text', 'function_name', 10, 1 ); ?>
-	 * @example
-	 * <?php
-	 * add_filter( 'um_avatar_image_alternate_text', 'my_avatar_image_alternate_text', 10, 1 );
-	 * function my_avatar_image_alternate_text( $avatar_alt ) {
-	 *     // your code here
-	 *     return $avatar_alt;
-	 * }
-	 * ?>
-	 */
-	$image_alt = apply_filters( "um_avatar_image_alternate_text",  um_user("display_name") );
-
-	if ( ! $avatar && UM()->options()->get( 'use_gravatars' ) ) {
-
-		$default = get_option( 'avatar_default', 'mystery' );
-		if ( $default == 'gravatar_default' ) {
-			$default = '';
-		}
-
-		$rating = get_option('avatar_rating');
-		if ( !empty( $rating ) ) {
-			$rating = "&amp;r={$rating}";
-		}
-
-		if ( UM()->options()->get('use_gravatars') && ! um_user('synced_profile_photo') ){
-			$avatar_url  = um_get_domain_protocol().'gravatar.com/avatar/'.um_user('synced_gravatar_hashed_id');
-			$avatar_url = add_query_arg('s',400, $avatar_url);
-			$gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' );
-						
-			if ( $gravatar_type == 'default' ) {
-				if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) {
-					$avatar_url = add_query_arg('d', um_get_default_avatar_uri(), $avatar_url  );
-				}
-			} else {
-				$avatar_url = add_query_arg('d', $gravatar_type, $avatar_url  );
-			}
-						
-		}
-			
-		$avatar = '<img src="' .$avatar_url .'?d='. $default . '&amp;s=' . $size . $rating .'" class="func-um_get_avatar gravatar avatar avatar-'.$size.' um-avatar" width="'.$size.'" height="'.$size.'" alt="'.$image_alt.'" />';
-			
-	}else if( empty( $avatar ) ){
-		$default_avatar_uri = um_get_default_avatar_uri();
-
-		$avatar = '<img src="' .$default_avatar_uri  .'" class="gravatar avatar avatar-'.$size.' um-avatar" width="'.$size.'" height="'.$size.'" alt="'.$image_alt.'" />';
-	}
-
 	return $avatar;
 }
 add_filter( 'get_avatar', 'um_get_avatar', 99999, 5 );
\ No newline at end of file
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index f0634d82..52234e1e 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1773,16 +1773,24 @@ function um_get_user_avatar_data( $user_id = '', $size = '96' ) {
         $data['type'] = 'sync';
         $data['class'] .= ' um-avatar-default';
     } else if( UM()->options()->get( 'use_gravatars' ) ) {
-        $avatar_hash_id = get_user_meta( $user_id, 'synced_gravatar_hashed_id', true );
+	    $avatar_hash_id = get_user_meta( $user_id, 'synced_gravatar_hashed_id', true );
         $data['url'] = set_url_scheme( '//gravatar.com/avatar/' . $avatar_hash_id );
         $data['url'] = add_query_arg( 's', 400, $data['url'] );
+        $rating = get_option('avatar_rating');
+		if ( !empty( $rating ) ) {
+			$data['url'] = add_query_arg( 'r', $rating, $data['url'] );
+		}
         $gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' );
         if ( $gravatar_type == 'default' ) {
             if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) {
                 $data['url'] = add_query_arg( 'd', $data['default'], $data['url'] );
             }
         } else {
-            $data['url'] = add_query_arg( 'd', $gravatar_type, $data['url'] );
+            $default = get_option( 'avatar_default', 'mystery' );
+            if ( $default == 'gravatar_default' ) {
+                $default = '';
+            }
+            $data['url'] = add_query_arg( 'd', $default, $data['url'] );
         }
         $data['type'] = 'gravatar';
         $data['class'] .= ' um-avatar-gravatar';