diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index a587338eb..f8d734e6d 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -95,28 +95,7 @@ if($settings->_useHomeAsRootFolder && !$user->isAdmin() && $user->getHomeFolder(
 	$dms->setRootFolderID($user->getHomeFolder());
 }
 
-global $logger;
-$notifier = new SeedDMS_NotificationService($logger);
-
-if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-		if(method_exists($notificationObj, 'preAddService')) {
-			$notificationObj->preAddService($dms, $notifier);
-		}
-	}
-}
-
-if($settings->_enableEmail) {
-	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword), 'email');
-}
-
-if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-		if(method_exists($notificationObj, 'postAddService')) {
-			$notificationObj->postAddService($dms, $notifier);
-		}
-	}
-}
+require_once('inc/inc.Notification.php');
 
 /* Include additional language file for view
  * This file must set $LANG[xx][]
diff --git a/inc/inc.Notification.php b/inc/inc.Notification.php
new file mode 100644
index 000000000..cfc3ab615
--- /dev/null
+++ b/inc/inc.Notification.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Create notifcation service
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+global $logger;
+$notifier = new SeedDMS_NotificationService($logger);
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+		if(method_exists($notificationObj, 'preAddService')) {
+			$notificationObj->preAddService($dms, $notifier);
+		}
+	}
+}
+
+if($settings->_enableEmail) {
+	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword), 'email');
+}
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+		if(method_exists($notificationObj, 'postAddService')) {
+			$notificationObj->postAddService($dms, $notifier);
+		}
+	}
+}