diff --git a/Logic/Osm/ChangesetHandler.ts b/Logic/Osm/ChangesetHandler.ts
index a432bc08a..5c23ac5f1 100644
--- a/Logic/Osm/ChangesetHandler.ts
+++ b/Logic/Osm/ChangesetHandler.ts
@@ -1,3 +1,4 @@
+import escapeHtml from "escape-html";
 import {OsmConnection, UserDetails} from "./OsmConnection";
 import {UIEventSource} from "../UIEventSource";
 import {ElementStorage} from "../ElementStorage";
@@ -105,7 +106,7 @@ export class ChangesetHandler {
                 `<tag k="theme" v="${layout.id}"/>`,
                 `<tag k="language" v="${Locale.language.data}"/>`,
                 surveySource,
-                layout.maintainer !== undefined ? `<tag k="theme-creator" v="${layout.maintainer}"/>` : "",
+                layout.maintainer !== undefined ? `<tag k="theme-creator" v="${escapeHtml(layout.maintainer)}"/>` : "",
                 `</changeset></osm>`].join("")
         }, function (err, response) {
             if (response === undefined) {
diff --git a/UI/UserBadge.ts b/UI/UserBadge.ts
index 04ffcd9ac..614c5c541 100644
--- a/UI/UserBadge.ts
+++ b/UI/UserBadge.ts
@@ -109,7 +109,7 @@ export class UserBadge extends UIElement {
 
         const userName = new Link(
             new FixedUiElement(user.name),
-            `https://www.openstreetmap.org/user/${user.name}'`,
+            `https://www.openstreetmap.org/user/${user.name}`,
             true);