diff --git a/settings/js/personal.js b/settings/js/personal.js
index 3e1a0d7497..65bc88d209 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -100,7 +100,7 @@ function updateAvatar (hidedefault) {
 	$displaydiv.css({'background-color': ''});
 	$displaydiv.avatar(OC.currentUser, 145, true);
 
-	$('#removeavatar').show();
+	$('#removeavatar').removeClass('hidden').addClass('inlineblock');
 }
 
 function showAvatarCropper () {
@@ -303,7 +303,7 @@ $(document).ready(function () {
 			url: OC.generateUrl('/avatar/'),
 			success: function () {
 				updateAvatar(true);
-				$('#removeavatar').hide();
+				$('#removeavatar').addClass('hidden').removeClass('inlineblock');
 			}
 		});
 	});
@@ -327,15 +327,14 @@ $(document).ready(function () {
 		]
 	});
 
-	// does the user have a custom avatar? if he does hide #removeavatar
-	// needs to be this complicated because we can't check yet if an avatar has been loaded, because it's async
-	var url = OC.generateUrl(
+	// does the user have a custom avatar? if he does show #removeavatar
+	$.get(OC.generateUrl(
 		'/avatar/{user}/{size}',
 		{user: OC.currentUser, size: 1}
-	);
-	$.get(url, function (result) {
-		if (typeof(result) === 'object') {
-			$('#removeavatar').hide();
+	), function (result) {
+		if (typeof(result) === 'string') {
+			// Show the delete button when the avatar is custom
+			$('#removeavatar').removeClass('hidden').addClass('inlineblock');
 		}
 	});
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 5bae01742b..65b8b81aa9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -41,7 +41,7 @@
 		<?php if ($_['avatarChangeSupported']): ?>
 		<label for="uploadavatar" class="inlineblock button icon-upload svg" id="uploadavatarbutton" title="<?php p($l->t('Upload new')); ?>"></label>
 		<div class="inlineblock button icon-folder svg" id="selectavatar" title="<?php p($l->t('Select from Files')); ?>"></div>
-		<div class="inlineblock button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
+		<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 		<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 		<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
 		<?php else: ?>