diff --git a/core/image.class.php b/core/image.class.php
index fea1df60..7206b347 100644
--- a/core/image.class.php
+++ b/core/image.class.php
@@ -91,6 +91,10 @@ class Image {
 		return $this->ext;
 	}
 
+	public function get_source() {
+		return $this->source;
+	}
+
 	public function parse_link_template($tmpl, $_escape="url_escape") {
 		global $config;
 
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index b835ca7f..1725048d 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -25,6 +25,7 @@ class TagEditTheme extends Themelet {
 		global $config;
 		if($config->get_bool("tag_edit_anon") || !$user->is_anonymous()) {
 			$h_tags = html_escape($image->get_tag_list());
+			$h_source = html_escape($image->get_source());
 			$i_image_id = int_escape($image->id);
 
 			$source_edit = "";
diff --git a/ext/view/main.php b/ext/view/main.php
index 154b9d8b..8f66f92b 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -55,7 +55,8 @@ class ViewImage extends Extension {
 		}
 
 		if(is_a($event, 'DisplayingImageEvent')) {
-			$iibbe = new ImageInfoBoxBuildingEvent($event->get_image(), $event->user);
+			global $user;
+			$iibbe = new ImageInfoBoxBuildingEvent($event->get_image(), $user);
 			send_event($iibbe);
 			ksort($iibbe->parts);
 			$this->theme->display_page($event->page, $event->get_image(), $iibbe->parts);