diff --git a/core/js/avatar.js b/core/js/avatar.js
deleted file mode 100644
index 10214c35fbe..00000000000
--- a/core/js/avatar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-$(document).ready(function(){
-	if (OC.currentUser) {
-
-	}
-	// User settings
-	$.each($('td.avatar .avatardiv'), function(i, element) {
-		$(element).avatar($(element).parent().parent().data('uid'), 32);
-	});
-});
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index 74bb9b1881d..26eb3507d7b 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -47,16 +47,20 @@
  */
 
 (function ($) {
-	$.fn.imageplaceholder = function(seed, text) {
+	$.fn.imageplaceholder = function(seed, text, size) {
 		// set optional argument "text" to value of "seed" if undefined
 		text = text || seed;
 
 		var hash = md5(seed),
 			maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16),
 			hue = parseInt(hash, 16) / maxRange * 256,
-			height = this.height();
+			height = this.height() || size || 32;
 		this.css('background-color', 'hsl(' + hue + ', 90%, 65%)');
 
+		// Placeholders are square
+		this.height(height);
+		this.width(height);
+
 		// CSS rules
 		this.css('color', '#fff');
 		this.css('font-weight', 'normal');
diff --git a/lib/private/template.php b/lib/private/template.php
index 04d6a906880..c2528c26851 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -119,7 +119,6 @@ class OC_Template extends \OC\Template\Base {
 
 			// avatars
 			if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {
-				\OC_Util::addScript('avatar', null, true);
 				\OC_Util::addScript('jquery.avatar', null, true);
 				\OC_Util::addScript('placeholder', null, true);
 			}
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 9b95408dd0a..aea94053572 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -68,7 +68,7 @@ var UserList = {
 			if (user.isAvatarAvailable === true) {
 				$('div.avatardiv', $tr).avatar(user.name, 32, undefined, undefined, undefined, user.displayname);
 			} else {
-				$('div.avatardiv', $tr).imageplaceholder(user.displayname);
+				$('div.avatardiv', $tr).imageplaceholder(user.displayname, undefined, 32);
 			}
 		}