Index: indico/MaKaC/webinterface/tpls/ConfModifBadgeDesign.tpl
===================================================================
--- indico/MaKaC/webinterface/tpls/ConfModifBadgeDesign.tpl	(revision 218bbae75557b46277e1af82c6758c123a260e4f)
+++ indico/MaKaC/webinterface/tpls/ConfModifBadgeDesign.tpl	(revision dad7bde13b6efcc880ebc8205323d1e8908a84a7)
@@ -33,7 +33,4 @@
     // List of badge template items
     var items = [];
-
-    var firstLoad = true;
-
 
     // Item class
@@ -367,24 +364,19 @@
 
     function sent() {
-        if (firstLoad) {
-            firstLoad = false;
-        }
-        else {
-            var iframeDocument = $('#uploadTarget')[0].contentDocument || $('#uploadTarget')[0].contentWindow;
-            if (iframeDocument.document) {
-                iframeDocument = iframeDocument.document;
-            }
-
-            try {
-                if (backgroundId != -1) {
-                    $('#background').remove();
-                }
-                backgroundId = $('#background_id', iframeDocument).html();
-                var backgroundURL = $('#background_url', iframeDocument).html();
-                displayBackground(backgroundURL);
-            }
-            catch (err) {
-                $('#loadingIcon').hide();
-            }
+        var iframeDocument = $('#uploadTarget')[0].contentDocument || $('#uploadTarget')[0].contentWindow;
+        if (iframeDocument.document) {
+            iframeDocument = iframeDocument.document;
+        }
+
+        try {
+            if (backgroundId != -1) {
+                $('#background').remove();
+            }
+            backgroundId = $('#background_id', iframeDocument).html();
+            var backgroundURL = $('#background_url', iframeDocument).html();
+            displayBackground(backgroundURL);
+        }
+        catch (err) {
+            $('#loadingIcon').hide();
         }
     }
@@ -431,4 +423,5 @@
         // show a throbber when uploading a background
         $('#bgForm').submit(function() {
+            $('#uploadTarget').one('load', sent);
             $('#loadingIcon').show();
         });
@@ -475,6 +468,4 @@
             save();
         });
-
-        $('#uploadTarget').load(sent);
     });
 </script>