Index: branches/RC/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 11538)
+++ branches/RC/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 11623)
@@ -127,6 +127,22 @@
 
 			$this->Application->Session->SetCookie('last_module', $object->GetDBField('Module'));
 		}
+
+		/**
+		 * Changes default module to custom (when available)
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterConfigRead(&$event)
+		{
+			parent::OnAfterConfigRead($event);
+
+			if ($this->Application->findModule('Name', 'Custom')) {
+				$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+				$fields['Module']['default'] = 'Custom';
+				$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+			}
+		}
 	}