diff --git a/blocks/html/deeds/deedList.inc b/blocks/html/deeds/deedList.inc
index 4b18269..55761d6 100644
--- a/blocks/html/deeds/deedList.inc
+++ b/blocks/html/deeds/deedList.inc
@@ -44,7 +44,7 @@
 
 					$url = new URL(BASE_URL.'/deeds/deleteDeed.php');
 					$url->deed_id = $deed->getId();
-					$url->return_url = "http://$_SERVER[SERVER_NAME]$_SERVER[REQUEST_URI]";
+					$url->return_url = "https://'.BASE_HOST.$_SERVER['REQUEST_URI']";
 					$deleteButton = "
 					<button type=\"button\" class=\"delete\" onclick=\"COB.deleteConfirmation('$url');\">
 						Delete
diff --git a/blocks/html/interments/intermentList.inc b/blocks/html/interments/intermentList.inc
index 4c33c9e..833d9b5 100644
--- a/blocks/html/interments/intermentList.inc
+++ b/blocks/html/interments/intermentList.inc
@@ -7,7 +7,7 @@
  * @param GET sort
  */
 $previousSort = isset($_GET['sort']) ? $_GET['sort'] : 'deceasedDate';
-$url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
+$url = new URL('https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
 $url->purgeEmptyParameters();
 $return_url = $url->__toString();
 ?>
@@ -65,7 +65,7 @@ $return_url = $url->__toString();
 					";
 					$url = new URL(BASE_URL.'/interments/deleteInterment.php');
 					$url->interment_id = $interment->getId();
-					$url->return_url = "http://$_SERVER[SERVER_NAME]$_SERVER[REQUEST_URI]";
+					$url->return_url = "https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
 					$deleteButton = "
 					<button type=\"button\" class=\"delete\" onclick=\"COB.deleteConfirmation('$url');\">
 						Delete
diff --git a/html/interments/home.php b/html/interments/home.php
index 0424c18..c6af36f 100644
--- a/html/interments/home.php
+++ b/html/interments/home.php
@@ -28,7 +28,7 @@ if ($template->outputFormat=='html') {
 	}
 
 	if (userIsAllowed('Interments') && !count($search)) {
-		$return_url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
+		$return_url = new URL('https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
 		$template->blocks[] = new Block('interments/addIntermentForm.inc',
 										array('return_url'=>$return_url));
 	}
diff --git a/libraries/framework/blocks/html/pageNavigation.inc b/libraries/framework/blocks/html/pageNavigation.inc
index 1609bdc..1e31edc 100644
--- a/libraries/framework/blocks/html/pageNavigation.inc
+++ b/libraries/framework/blocks/html/pageNavigation.inc
@@ -6,7 +6,7 @@
  * @param Zend_Paginator $this->pages
  */
 if ($this->pages->pageCount > 1) {
-	$url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
+	$url = new URL('https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
 	$url->purgeEmptyParameters();
 
 	echo '<ul class="pageNavigation">';