diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 703bd9fd7d..29d019baea 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -48,8 +48,12 @@
 
 (function ($) {
 	$.fn.avatar = function(user, size, ie8fix, hidedefault, callback, displayname) {
-		user = String(user);
-		displayname = String(displayname);
+		if (typeof(user) !== 'undefined') {
+			user = String(user);
+		}
+		if (typeof(displayname) !== 'undefined') {
+			displayname = String(displayname);
+		}
 
 		if (typeof(size) === 'undefined') {
 			if (this.height() > 0) {