diff --git a/templates/classifieds/edit.html b/templates/classifieds/edit.html
index 99ebe86..6ac5a4f 100644
--- a/templates/classifieds/edit.html
+++ b/templates/classifieds/edit.html
@@ -120,7 +120,7 @@
             <div class="form-group">
                 <label>Opis *</label>
                 <div id="quill-editor" class="quill-container"></div>
-                <textarea id="description" name="description" style="display:none;" required></textarea>
+                <textarea id="description" name="description" style="display:none;"></textarea>
             </div>
 
             <div class="form-row">
@@ -185,9 +185,14 @@ var quill = new Quill('#quill-editor', {
 });
 quill.root.innerHTML = {{ classified.description|tojson }};
 
-document.querySelector('form').addEventListener('submit', function() {
+document.querySelector('form').addEventListener('submit', function(e) {
     var html = quill.root.innerHTML;
-    if (html === '<p><br></p>') html = '';
+    if (html === '<p><br></p>' || quill.getText().trim() === '') {
+        e.preventDefault();
+        alert('Wpisz treść ogłoszenia.');
+        quill.focus();
+        return;
+    }
     document.getElementById('description').value = html;
 });
 
diff --git a/templates/classifieds/new.html b/templates/classifieds/new.html
index cf66c8d..12b08e0 100755
--- a/templates/classifieds/new.html
+++ b/templates/classifieds/new.html
@@ -319,7 +319,7 @@
             <div class="form-group">
                 <label>Opis *</label>
                 <div id="quill-editor" class="quill-container"></div>
-                <textarea id="description" name="description" style="display:none;" required></textarea>
+                <textarea id="description" name="description" style="display:none;"></textarea>
             </div>
 
             <div class="form-row">
@@ -368,10 +368,17 @@ var quill = new Quill('#quill-editor', {
     }
 });
 
-// Sync Quill content to hidden textarea on form submit
-document.querySelector('form').addEventListener('submit', function() {
+// Sync Quill content to hidden textarea on form submit + validate non-empty.
+// Note: hidden textarea cannot use `required` (browser cannot show validation
+// UI on display:none fields, which silently blocks submit).
+document.querySelector('form').addEventListener('submit', function(e) {
     var html = quill.root.innerHTML;
-    if (html === '<p><br></p>') html = '';
+    if (html === '<p><br></p>' || quill.getText().trim() === '') {
+        e.preventDefault();
+        alert('Wpisz treść ogłoszenia.');
+        quill.focus();
+        return;
+    }
     document.getElementById('description').value = html;
 });
 
diff --git a/utils/markdown.py b/utils/markdown.py
index 5184528..f6dd02e 100644
--- a/utils/markdown.py
+++ b/utils/markdown.py
@@ -56,13 +56,16 @@ def parse_forum_markdown(text, current_user_name=None):
     # Inline code (`code`)
     text = re.sub(r'`([^`]+)`', r'<code class="forum-code">\1</code>', text)
 
-    # Bold (**text** or __text__)
+    # Bold (**text** or __text__) — require non-word boundary on `_` form
+    # so URLs like `forestry_office` don't get partially bolded.
     text = re.sub(r'\*\*([^*]+)\*\*', r'<strong>\1</strong>', text)
-    text = re.sub(r'__([^_]+)__', r'<strong>\1</strong>', text)
+    text = re.sub(r'(^|\W)__([^_\n]+?)__(?=\W|$)', r'\1<strong>\2</strong>', text)
 
-    # Italic (*text* or _text_) - careful not to match bold
-    text = re.sub(r'(?<!\*)\*([^*]+)\*(?!\*)', r'<em>\1</em>', text)
-    text = re.sub(r'(?<!_)_([^_]+)_(?!_)', r'<em>\1</em>', text)
+    # Italic (*text* or _text_) — same boundary rule for `_` to avoid
+    # eating underscores inside URLs (e.g. ?g_ep=...) which corrupted forum
+    # links. The captured leading char is re-emitted.
+    text = re.sub(r'(?<!\*)\*([^*\n]+?)\*(?!\*)', r'<em>\1</em>', text)
+    text = re.sub(r'(^|\W)_(?!_)([^_\n]+?)_(?=\W|$)', r'\1<em>\2</em>', text)
 
     # Links [text](url) - only allow http/https
     def safe_link(match):