diff --git a/core/um-actions-profile.php b/core/um-actions-profile.php
index 768ebd54..e5ba2ff3 100644
--- a/core/um-actions-profile.php
+++ b/core/um-actions-profile.php
@@ -378,7 +378,11 @@
 				unset( $items['myaccount'] );
 				unset( $items['logout'] );
 				unset( $items['cancel'] );
+				
+				if ( is_array( $actions ) ) {
 				$items = array_merge( $items, $actions );
+				}
+				
 				$items['cancel'] = $cancel;
 				
 				$items = apply_filters('um_profile_edit_menu_items', $items );
diff --git a/core/um-enqueue.php b/core/um-enqueue.php
index 1c261ea5..3813ff17 100644
--- a/core/um-enqueue.php
+++ b/core/um-enqueue.php
@@ -33,7 +33,7 @@ class UM_Enqueue {
 			
 		} else {
 		
-			wp_register_script('um_minified', um_url . 'assets/js/um.min.js', array('jquery') );
+			wp_register_script('um_minified', um_url . 'assets/js/um.min.js', array('jquery'), '', true );
 			wp_enqueue_script('um_minified');
 			
 			wp_register_style('um_minified', um_url . 'assets/css/um.min.css' );
diff --git a/core/um-filters-avatars.php b/core/um-filters-avatars.php
index 87185818..69993071 100644
--- a/core/um-filters-avatars.php
+++ b/core/um-filters-avatars.php
@@ -5,7 +5,13 @@
 	***/
 	function um_get_avatar($content, $id='', $size = '96', $avatar_class = '', $default = '', $alt = '') {
 
-		return um_user('profile_photo', $size);
+		if ( is_email( $id ) )
+			$id = email_exists( $id );
+		
+		um_fetch_user( $id );
+		$avatar = um_user('profile_photo', $size);
+		um_reset_user();
+		return $avatar;
 	
 	}