diff --git a/libraries/joomla/form/fields/subform.php b/libraries/joomla/form/fields/subform.php
index 5b8a1f775be86..2f4e276cc4949 100644
--- a/libraries/joomla/form/fields/subform.php
+++ b/libraries/joomla/form/fields/subform.php
@@ -203,10 +203,10 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 			$this->value = json_decode($this->value, true);
 		}
 
-		if (!$this->formsource)
+		if (!$this->formsource && $element->form)
 		{
 			// Set the formsource parameter from the content of the node
-			$this->formsource = $element->children()->saveXML();
+			$this->formsource = $element->form->saveXML();
 		}
 
 		return true;
diff --git a/libraries/joomla/form/form.php b/libraries/joomla/form/form.php
index e4ea76b2b39f8..eb3dac8489d32 100644
--- a/libraries/joomla/form/form.php
+++ b/libraries/joomla/form/form.php
@@ -1890,7 +1890,7 @@ protected function loadField($element, $group = null, $value = null)
 		 */
 		if ($value === null)
 		{
-			$default = (string) $element['default'];
+			$default = (string) ($element['default'] ? $element['default'] : $element->default);
 
 			if (($translate = $element['translate_default']) && ((string) $translate == 'true' || (string) $translate == '1'))
 			{