diff --git a/irc/irc.php b/irc/irc.php
index 0ac7be37..f400a77c 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -33,7 +33,7 @@ function irc_addon_settings(&$a,&$s) {
 	$autochans = get_pconfig( local_user(), 'irc','autochans');  /* auto connect chans */
 
 	$t = get_markup_template( "settings.tpl", "addon/irc/" );
-	$s .= replace_macros($t, array(
+	$s = replace_macros($t, array(
 	    	'$header' => t('IRC Settings'),
 		'$info' => t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
 		'$submit' => t('Save Settings'),
diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index 9366930f..687d9253 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -34,8 +34,26 @@ EOS;
 }
 
 function viewsrc_item_photo_menu(&$a,&$b) {
-	if((! local_user()) || (local_user() != $b['item']['uid']))
+	if(!local_user())
 		return;
-	$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']);
+
+	if (local_user() != $b['item']['uid']) {
+		$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s'",
+				intval(local_user()), dbesc($b['item']['guid']));
+
+		if (!$r)
+			return;
+
+		$item_id = $r[0]['id'];
+
+	} else
+		$item_id = $b['item']['id'];
+
+	$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $item_id), $b['menu']);
+
+	//if((! local_user()) || (local_user() != $b['item']['uid']))
+	//	return;
+
+	//$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']);
 
 }