diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php
index 79fcbd67faa4f..9b38738da8307 100644
--- a/components/com_users/tmpl/registration/default.php
+++ b/components/com_users/tmpl/registration/default.php
@@ -27,6 +27,7 @@
 
     <form id="member-registration" action="<?php echo Route::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
         <?php // Iterate through the form fieldsets and display each one. ?>
+        <?php $captcha = ''; ?>
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <?php $fields = $this->form->getFieldset($fieldset->name); ?>
             <?php if (count($fields)) : ?>
@@ -35,10 +36,19 @@
                     <?php if (isset($fieldset->label)) : ?>
                         <legend><?php echo Text::_($fieldset->label); ?></legend>
                     <?php endif; ?>
-                    <?php echo $this->form->renderFieldset($fieldset->name); ?>
+                    <?php foreach ($fields as $field) : ?>
+                        <?php if ($field->name === 'jform[captcha]') : ?>
+                            <?php $captcha = $field; ?>
+                        <?php else : ?>
+                            <?php echo $field->renderField(); ?>
+                        <?php endif; ?>     
+                    <?php endforeach; ?>
                 </fieldset>
             <?php endif; ?>
         <?php endforeach; ?>
+        <?php if ($captcha) : ?>
+            <?php echo $captcha->renderField(); ?>
+        <?php endif; ?>
         <div class="com-users-registration__submit control-group">
             <div class="controls">
                 <button type="submit" class="com-users-registration__register btn btn-primary validate">