diff --git a/app/public/static/js/package_edit.js b/app/public/static/js/package_edit.js
index 0701171a..fac8f678 100644
--- a/app/public/static/js/package_edit.js
+++ b/app/public/static/js/package_edit.js
@@ -84,10 +84,11 @@ window.addEventListener("load", () => {
 		},
 		"desc_page_topic": (val) => {
 			const topicId = document.getElementById("forums").value;
-			return topicId && val.indexOf(`forum.minetest.net/viewtopic.php?t=${topicId}`) >= 0;
+			const r = new RegExp(`forum\\.minetest\\.net\\/viewtopic\\.php\\?[a-z0-9=&]*t=${topicId}`);
+			return topicId && r.test(val);
 		},
 		"desc_page_repo": (val) => {
-			const repoUrl = document.getElementById("repo").value;
+			const repoUrl = document.getElementById("repo").value.replace(".git", "");
 			return repoUrl && val.indexOf(repoUrl.toLowerCase()) >= 0;
 		},
 	});
diff --git a/app/templates/packages/create_edit.html b/app/templates/packages/create_edit.html
index 201260d9..7639015d 100644
--- a/app/templates/packages/create_edit.html
+++ b/app/templates/packages/create_edit.html
@@ -21,7 +21,7 @@
 		<script src="/static/js/polltask.js"></script>
 		<script src="/static/js/package_create.js"></script>
 	{% endif %}
-	<script src="/static/js/package_edit.js?v=2"></script>
+	<script src="/static/js/package_edit.js?v=3"></script>
 {% endblock %}
 
 {% block content %}