diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 608f73a0..22294661 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -440,8 +440,9 @@ L.U.PermanentCreditsControl = L.Control.extend({
         position: 'bottomleft'
     },
 
-    initialize: function (map) {
+    initialize: function (map, options) {
         this.map = map;
+        L.Control.prototype.initialize.call(this, options);
     },
 
     onAdd: function () {
@@ -455,11 +456,6 @@ L.U.PermanentCreditsControl = L.Control.extend({
         return paragraphContainer;
     },
 
-    _update: function () {
-        this.setCredits();
-        this.setBackground();
-    },
-
     setCredits: function () {
         this.paragraphContainer.innerHTML = L.Util.toHTML(this.map.options.permanentCredit);
     },
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index fd59c5ea..52fe051d 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -277,7 +277,7 @@ L.U.Map.include({
         this._controls.measure = (new L.MeasureControl()).initHandler(this);
         this._controls.more = new L.U.MoreControls();
         this._controls.scale = L.control.scale();
-        if (this.options.permanentCredit) this.permanentCreditControl = (new L.U.PermanentCreditsControl(this)).addTo(this);
+        this._controls.permanentCredit = new L.U.PermanentCreditsControl(this);
         if (this.options.scrollWheelZoom) this.scrollWheelZoom.enable();
         else this.scrollWheelZoom.disable();
         this.renderControls();
@@ -310,6 +310,7 @@ L.U.Map.include({
             if (status === undefined || status === null) L.DomUtil.addClass(control._container, 'display-on-more');
             else L.DomUtil.removeClass(control._container, 'display-on-more');
         }
+        if (this.options.permanentCredit) this._controls.permanentCredit.addTo(this);
         if (this.options.moreControl) this._controls.more.addTo(this);
         if (this.options.scaleControl) this._controls.scale.addTo(this);
     },
@@ -1396,9 +1397,7 @@ L.U.Map.include({
             ['options.permanentCreditBackground', {handler: 'Switch', label: L._('Permanent credits background')}]
         ];
         var creditsBuilder = new L.U.FormBuilder(this, creditsFields, {
-            callback: function () {
-                this._controls.attribution._update();
-                this.permanentCreditControl._update();},
+            callback: this.renderControls,
             callbackContext: this
         });
         credits.appendChild(creditsBuilder.build());