diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index 011c18e3547bf..3f633a8266854 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -22,17 +22,23 @@
  */
 
 $classes = array_filter((array) $classes);
-$id      = $for . '-lbl';
+
+// $labelId is the id of the label element itself (always $for . '-lbl').
+// NOTE: Do not use $id here — $id in $displayData is the input control's id,
+// not the label's own id. Using $id ?? ... would silently reuse the input id
+// because extract() already sets $id to a non-null value for every field.
+$labelId = $for ? $for . '-lbl' : null;
+$tag     = empty($for) ? 'span' : 'label';
 
 if ($required) {
     $classes[] = 'required';
 }
 
 ?>
-<label id="<?php echo $id; ?>" for="<?php echo $for; ?>"<?php if (!empty($classes)) {
+<<?php echo $tag; ?><?php if ($labelId) : ?> id="<?php echo $labelId; ?>"<?php endif; ?><?php if (!empty($for)) : ?> for="<?php echo $for; ?>"<?php endif; ?><?php if (!empty($classes)) {
     echo ' class="' . implode(' ', $classes) . '"';
            } ?>>
     <?php echo $text; ?><?php if ($required) :
         ?><span class="star" aria-hidden="true">&#160;*</span><?php
     endif; ?>
-</label>
+</<?php echo $tag; ?>>
diff --git a/libraries/src/Form/Field/CaptchaField.php b/libraries/src/Form/Field/CaptchaField.php
index b24514b312372..598f61aa7a8cc 100644
--- a/libraries/src/Form/Field/CaptchaField.php
+++ b/libraries/src/Form/Field/CaptchaField.php
@@ -165,6 +165,36 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
         return $result;
     }
 
+    /**
+     * Method to get the field label markup.
+     *
+     * Overrides the default to guard against null captcha instances and
+     * to produce a proper <label for="..."> pointing at the captcha control.
+     * Captcha plugins receive $this->id via display() and should render their
+     * interactive control with that id, making the for association valid.
+     *
+     * @return  string  The field label markup.
+     *
+     * @since   _DEPLOY_VERSION_
+     */
+    protected function getLabel()
+    {
+        if ($this->hidden || $this->_captcha === null) {
+            return '';
+        }
+
+        $data = $this->collectLayoutData();
+
+        $extraData = [
+            'text'     => $data['label'],
+            'for'      => $this->id,
+            'classes'  => explode(' ', $data['labelclass']),
+            'position' => '',
+        ];
+
+        return $this->getRenderer($this->renderLabelLayout)->render(array_merge($data, $extraData));
+    }
+
     /**
      * Method to get the field input.
      *
diff --git a/libraries/src/Form/Field/SpacerField.php b/libraries/src/Form/Field/SpacerField.php
index e6f9abf7801b7..76bb5d8312224 100644
--- a/libraries/src/Form/Field/SpacerField.php
+++ b/libraries/src/Form/Field/SpacerField.php
@@ -78,7 +78,7 @@ protected function getLabel()
             $class = $this->required ? $class . ' required' : $class;
 
             // Add the opening label tag and main attributes attributes.
-            $label .= '<label id="' . $this->id . '-lbl" class="' . $class . '"';
+            $label .= '<span id="' . $this->id . '-lbl" class="' . $class . '"';
 
             // If a description is specified, use it to build a tooltip.
             if (!empty($this->description)) {
@@ -96,7 +96,7 @@ protected function getLabel()
             }
 
             // Add the label text and closing tag.
-            $label .= '>' . $text . '</label>';
+            $label .= '>' . $text . '</span>';
             $html[] = $label;
         }