--- a/nickname.js
+++ b/nickname.js
@@ -2,6 +2,7 @@
 
 function initNickname(connection) {
     const nick_input = document.getElementById('nick');
+    const spinner_img = document.getElementById('nick-spinner');
 
     const iq = $iq({type: 'get'})
         .c('pubsub', {xmlns: 'http://jabber.org/protocol/pubsub'})
@@ -16,11 +17,13 @@ function initNickname(connection) {
         const id = item.getAttributeNS(null, 'id');
         const nick = parseXPath(item, './nickname:nick');
         nick_input.value = nick.textContent;
+        spinner_img.hidden = true;
     }
 
     function onNicknameRetrievalError(string)
     {
         console.log('Failed to retrieve nickname: ' + string);
+        spinner_img.hidden = true;
     }
 
     nick_input.addEventListener('blur', function (evt) {
@@ -31,15 +34,18 @@ function initNickname(connection) {
                         .c('nick', {xmlns: 'http://jabber.org/protocol/nick'})
                             .t(nick_input.value);
         connection.sendIQ(iq, onNicknameChanged, onNicknameChangeError);
+        spinner_img.hidden = false;
     });
 
     function onNicknameChanged(iq)
     {
         console.log("onNicknameChanged", iq);
+        spinner_img.hidden = true;
     }
 
     function onNicknameChangeError(iq)
     {
         console.log("onNicknameChangeError", iq);
+        spinner_img.hidden = true;
     }
 }