diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 3587108c97..f280a5257a 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -114,7 +114,8 @@
          },
          success: function(data) {
            if (data.form) {
-             $("#g-dialog form").replaceWith(data.form);
+             var formData = unescape(data.form);
+             $("#g-dialog form").replaceWith(formData);
              $("#g-dialog form :submit").removeClass("ui-state-disabled")
                .attr("disabled", null);
              self._ajaxify_dialog();
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index d26919d5f4..18b463ca8e 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -124,7 +124,7 @@ public function add() {
         array("result" => "success",
               "location" => url::site("admin/watermarks")));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      print json_encode(array("result" => "error", "form" => rawurlencode((string) $form)));
     }
   }