diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index ebb326cd..701e3c93 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -227,13 +227,22 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 
 		return $link;
 	}
-	
+
 	/**
 	 * @return string
 	 */
 	public function LinkPreview() {
 		$record = $this->getRecord($this->currentPageID());
-		$baseLink = ($record && $record instanceof Page) ? $record->Link('?stage=Stage') : Director::absoluteBaseURL();
+		$baseLink = Director::absoluteBaseURL();
+		if ($record && $record instanceof Page) {
+			// if we are an external redirector don't show a link
+			if ($record instanceof RedirectorPage && $record->RedirectionType == 'External') {
+				$baseLink = false;
+			}
+			else {
+				$baseLink = $record->Link('?stage=Stage');
+			}
+		}
 		return $baseLink;
 	}
 
diff --git a/code/reports/Report.php b/code/reports/Report.php
index 9e14f348..c7cd5c28 100644
--- a/code/reports/Report.php
+++ b/code/reports/Report.php
@@ -296,7 +296,7 @@ class SS_Report extends ViewableData {
 					return sprintf(
 						'<a href="%s">%s</a>',
 						Controller::join_links(singleton('CMSPageEditController')->Link('show'), $item->ID),
-						Convert::raw2xml($value)
+						$value
 					);
 				};
 			}