diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php
index 237fb9e7e..afac255c7 100644
--- a/op/op.AddFile2.php
+++ b/op/op.AddFile2.php
@@ -109,7 +109,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 				$params['document'] = $document->getName();
 				$params['username'] = $user->getFullName();
 				$params['comment'] = $comment;
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php
index b493d5b3f..928622ea8 100644
--- a/op/op.AddMultiDocument.php
+++ b/op/op.AddMultiDocument.php
@@ -243,7 +243,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 				$params['username'] = $user->getFullName();
 				$params['comment'] = $comment;
 				$params['version_comment'] = $version_comment;
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index c8fcfa8fd..fc3919885 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -303,7 +303,7 @@ switch($command) {
 				$emailobj = new SeedDMS_EmailNotify($dms, $translator, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword, $settings->_smtpLazySSL, $settings->_smtpForceFrom);
 				$emailobj->setDebug(true);
 				$params = array();
-				$params['url'] = getBaseUrl().$settings->_httpRoot;
+				$params['url'] = $settings->getBaseUrlWithRoot();
 				$params['sitename'] = $settings->_siteName;
 				$params['version'] = (new SeedDMS_Version())->version();
 				$params['smtpserver'] = $settings->_smtpServer;
diff --git a/op/op.PasswordForgotten.php b/op/op.PasswordForgotten.php
index a4c111f76..b4a97581c 100644
--- a/op/op.PasswordForgotten.php
+++ b/op/op.PasswordForgotten.php
@@ -52,8 +52,8 @@ if($user) {
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$params['hash'] = $hash;
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash;
-	 	$params['url_prefix'] = getBaseUrl().$settings->_httpRoot;
+		$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ChangePassword.php?hash=".$hash;
+	 	$params['url_prefix'] = $settings->getBaseUrlWithRoot();
 		$emailobj->toIndividual($settings->_smtpSendFrom, $user, $subject, $message, $params);
 		add_log_line("Request for '".$login."' send to '".$email."'", PEAR_LOG_INFO);
 	}
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 146b41f2a..ef3932a20 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -185,7 +185,7 @@ else {
 			$params['username'] = $user->getFullName();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 			if($user->getId() != $oldowner->getId())
 				$notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 			$notifier->toList($user, $userrecipientsR, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
diff --git a/op/op.RemoveWorkflowFromDocument.php b/op/op.RemoveWorkflowFromDocument.php
index 1dd21fb7e..de401ac98 100644
--- a/op/op.RemoveWorkflowFromDocument.php
+++ b/op/op.RemoveWorkflowFromDocument.php
@@ -85,7 +85,7 @@ if($version->removeWorkflow($user)) {
 		$params['username'] = $user->getFullName();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
 		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
diff --git a/op/op.ReturnFromSubWorkflow.php b/op/op.ReturnFromSubWorkflow.php
index e76da43bf..a826e81e6 100644
--- a/op/op.ReturnFromSubWorkflow.php
+++ b/op/op.ReturnFromSubWorkflow.php
@@ -88,7 +88,7 @@ if($version->returnFromSubWorkflow($user, $transition, $_POST["comment"])) {
 		$params['username'] = $user->getFullName();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
 		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
diff --git a/op/op.RunSubWorkflow.php b/op/op.RunSubWorkflow.php
index 092e03710..3cbced374 100644
--- a/op/op.RunSubWorkflow.php
+++ b/op/op.RunSubWorkflow.php
@@ -83,7 +83,7 @@ if($version->runSubWorkflow($subworkflow)) {
 		$params['username'] = $user->getFullName();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
 		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php
index 64c7fbe5c..78034d542 100644
--- a/op/op.UpdateDocument2.php
+++ b/op/op.UpdateDocument2.php
@@ -183,7 +183,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 				$params['username'] = $user->getFullName();
 				$params['comment'] = $document->getComment();
 				$params['version_comment'] = $contentResult->getContent()->getComment();
-				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
@@ -208,7 +208,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 2710b7164..c3f5b4786 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -331,7 +331,7 @@ else if ($action == "sendlogindata" && $settings->_enableEmail) {
 		$params['username'] = $newuser->getFullName();
 		$params['login'] = $newuser->getLogin();
 		$params['comment'] = $comment;
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php";
+		$params['url'] = $settings->getBaseUrlWithRoot()."out/out.ViewFolder.php";
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toIndividual($user, $newuser, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);