diff --git a/codepot/src/codepot/controllers/issue.php b/codepot/src/codepot/controllers/issue.php
index 3fd43c63..4e8166ee 100644
--- a/codepot/src/codepot/controllers/issue.php
+++ b/codepot/src/codepot/controllers/issue.php
@@ -707,6 +707,7 @@ class Issue extends Controller
 				$change->priority = $this->input->post('issue_change_priority');
 				$change->comment = $this->input->post('issue_change_comment');
 
+				$old_state = NULL;
 				if ($this->issues->change ($login['id'], $project, $issueid, $change, $is_nonmember, $old_state) === FALSE)
 				{
 					$status = 'error - ' . $this->issues->getErrorMessage();
@@ -714,8 +715,7 @@ class Issue extends Controller
 				else
 				{
 					$status = 'ok';
-
-					if (CODEPOT_ISSUE_NOTIFICATION && $old_state->owner != $change->owner)
+					if (CODEPOT_ISSUE_NOTIFICATION && $old_state != NULL && $old_state->owner != $change->owner)
 					{
 						// TODO: message localization
 						$email_subject =  sprintf (
diff --git a/codepot/src/codepot/models/issuemodel.php b/codepot/src/codepot/models/issuemodel.php
index 1b788a46..22587040 100644
--- a/codepot/src/codepot/models/issuemodel.php
+++ b/codepot/src/codepot/models/issuemodel.php
@@ -307,7 +307,6 @@ class IssueModel extends Model
 			$old_state = $result[0];
 			if ($change->comment == '' || $disallow_state_change)
 			{
-
 				if ($old_state->type == $change->type &&
 				    $old_state->status == $change->status &&
 				    $old_state->owner == $change->owner &&
@@ -328,6 +327,7 @@ class IssueModel extends Model
 				}
 			}
 		}
+		else $old_state = NULL;
 
 		$this->db->set ('projectid', $project->id);
 		$this->db->set ('id', $id);
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index 35a907e0..fe33147d 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -995,7 +995,14 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
 </div>
 
 <div id='issue_show_state' class='collapsible-box'>
-	<div id='issue_show_metadata_header' class='collapsible-box-header'><?php print $this->lang->line('State')?></div>
+
+	<div id='issue_show_metadata_header' class='collapsible-box-header'>
+		<?php
+		$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($issue->owner));
+		print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
+		print htmlspecialchars($issue->owner);
+		?>
+	</div>
 	<div id='issue_show_metadata_body' class='codepot-metadata-collapsible-body'>
 		<ul id='issue_show_metadata_list' class='codepot-horizontal-list'>
 			<li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($issue->createdon); ?></li>
@@ -1011,8 +1018,6 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
 		</ul>
 
 		<?php
-			$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($issue->owner));
-			print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
 
 			if (!empty($related_code_revisions))
 			{
@@ -1099,8 +1104,8 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
 		print '<div class="codepot-issue-start-topline">';
 			printf ('<div class="codepot-issue-change-date">%s</div>',  codepot_dbdatetodispdate($new->updatedon));
 			print '<div class="codepot-issue-comment-updater">';
-			$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby));
-			print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
+			//$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby));
+			//print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
 			print htmlspecialchars($new->updatedby);
 			print '</div>';
 
@@ -1124,8 +1129,8 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
 		print '<div class="codepot-issue-change-topline">';
 		printf ('<div class="codepot-issue-change-date">%s</div>',  codepot_dbdatetodispdate($new->updatedon));
 		print '<div class="codepot-issue-comment-updater">';
-		$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby));
-		print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
+		//$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby));
+		//print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
 		print htmlspecialchars($new->updatedby);
 		print '</div>';