From d79c8c6d132d63705e9448e89602a7191b37586a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 17 Mar 2016 17:34:22 +0100
Subject: [PATCH] Update avatar on username change if avatar is set

* fixes #20455
---
 settings/js/personal.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/settings/js/personal.js b/settings/js/personal.js
index b0bfa8eb230..3b2316d0614 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -83,7 +83,10 @@ function changeDisplayName () {
 				$('#oldDisplayName').val($('#displayName').val());
 				// update displayName on the top right expand button
 				$('#expandDisplayName').text($('#displayName').val());
-				updateAvatar();
+				// update avatar if avatar is available
+				if(!$('#removeavatar').hasClass('hidden')) {
+					updateAvatar();
+				}
 			}
 			else {
 				$('#newdisplayname').val(data.data.displayName);
-- 
GitLab