diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
index 85de79d5c8..d9d4820c0e 100644
--- a/actions/apistatusesretweet.php
+++ b/actions/apistatusesretweet.php
@@ -80,7 +80,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if ($this->user->id == $notice->profile_id) {
-            $this->clientError(_('Cannot repeat your own notice.'));
+            $this->clientError(_('Cannot repeat your own notice.'),
                                400, $this->format);
             return false;
         }
diff --git a/lib/noticelist.php b/lib/noticelist.php
index a106478edd..85e1befccf 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -535,7 +535,7 @@ class NoticeListItem extends Widget
 
             $repeater = Profile::staticGet('id', $this->repeat->profile_id);
 
-            $attrs = array('href' => $this->profile->profileurl,
+            $attrs = array('href' => $repeater->profileurl,
                            'class' => 'url');
 
             if (!empty($repeater->fullname)) {
@@ -544,12 +544,12 @@ class NoticeListItem extends Widget
 
             $this->out->elementStart('span', 'repeat vcard');
 
-            $this->out->elementStart('a', $attrs);
-
             $this->out->raw(_('Repeated by'));
 
             $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
 
+            $this->out->elementStart('a', $attrs);
+
             $this->out->element('img', array('src' => ($avatar) ?
                                              $avatar->displayUrl() :
                                              Avatar::defaultImage(AVATAR_MINI_SIZE),