diff --git a/settings/js/personal.js b/settings/js/personal.js
index 26c50f8fa5de26e24a96da2da89683295b3b36f7..fe8c21aa4f10c376b5fd0dbaa8d13f7fd576fcf1 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -284,13 +284,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
-	OC.Router.registerLoadedCallback(function() {
-		var url = OC.Router.generate('core_avatar_get', {user: OC.currentUser, size: 1})+'?requesttoken='+oc_requesttoken;
-		$.get(url, function(result) {
-			if (typeof(result) === 'object') {
-				$('#removeavatar').addClass('hidden');
-			}
-		});
+	var url = OC.generateUrl(
+		'/avatar/{user}/{size}',
+		{user: OC.currentUser, size: 1}
+	) + '?requesttoken=' + oc_requesttoken;
+	$.get(url, function(result) {
+		if (typeof(result) === 'object') {
+			$('#removeavatar').addClass('hidden');
+		}
 	});
 } );