diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index 9f797ab3b0af5..89b909d88619a 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -13,13 +13,18 @@
 JHtml::_('behavior.tooltip');
 JHtml::_('behavior.formvalidation');
 JHtml::_('behavior.combobox');
-$hasContent = empty($this->item->module) || $this->item->module == 'custom' || $this->item->module == 'mod_custom';
+
+$hasContent = empty($this->item->module) ||  isset($this->item->xml->customContent);
+$hasContentFieldName = "content";
+//For a latter improvement
+if($hasContent)
+	$hasContentFieldName = "content";
 
 $script = "Joomla.submitbutton = function(task)
 	{
 			if (task == 'module.cancel' || document.formvalidator.isValid(document.id('module-form'))) {";
 if ($hasContent) {
-	$script .= $this->form->getField('content')->save();
+	$script .= $this->form->getField($hasContentFieldName)->save();
 }
 $script .= "	Joomla.submitform(task, document.getElementById('module-form'));
 				if (self != top) {
@@ -113,9 +118,9 @@
 			<legend><?php echo JText::_('COM_MODULES_CUSTOM_OUTPUT'); ?></legend>
 			<ul class="adminformlist">
 			<div class="clr"></div>
-			<li><?php echo $this->form->getLabel('content'); ?>
+			<li><?php echo $this->form->getLabel($hasContentFieldName); ?>
 			<div class="clr"></div>
-			<?php echo $this->form->getInput('content'); ?></li>
+			<?php echo $this->form->getInput($hasContentFieldName); ?></li>
 			</ul>
 		</fieldset>
 	</div>
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index 6ad82c106738a..d18ac9e9a24c9 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -12,6 +12,9 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>2.5.0</version>
 	<description>MOD_CUSTOM_XML_DESCRIPTION</description>
+
+    <customContent />
+
 	<files>
 		<filename module="mod_custom">mod_custom.php</filename>
 		<filename>index.html</filename>
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index e49095170b0c3..ecd5fdaef45bf 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -12,6 +12,9 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>2.5.0</version>
 	<description>MOD_CUSTOM_XML_DESCRIPTION</description>
+
+    <customContent />
+
 	<files>
 		<filename module="mod_custom">mod_custom.php</filename>
 		<filename>index.html</filename>