diff --git a/privatemsg.test b/privatemsg.test
index 3b0d47f..e36c27e 100644
--- a/privatemsg.test
+++ b/privatemsg.test
@@ -854,7 +854,7 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
     $json = $this->drupalGet('messages/autocomplete/<sc');
     $autocomplete = (array)json_decode($json);
     $this->assertEqual(count($autocomplete), 1, t('Autocomplete object contains one suggestion.'));
-    $this->assertEqual($autocomplete[check_plain($user4->name) . ', '], check_plain($user4->name));
+    $this->assertEqual($autocomplete[strip_tags($user4->name) . ', '], strip_tags($user4->name));
   }
 
   /**
diff --git a/privatemsg.theme.inc b/privatemsg.theme.inc
index dfe000e..59099b7 100644
--- a/privatemsg.theme.inc
+++ b/privatemsg.theme.inc
@@ -262,7 +262,7 @@ function theme_privatemsg_username($variables) {
     $recipient->uid = $recipient->recipient;
   }
   if (!empty($options['plain'])) {
-    $name = check_plain(format_username($recipient));
+    $name = strip_tags(format_username($recipient));
     if (!empty($options['unique'])) {
       $name .= ' [user]';
     }
diff --git a/privatemsg_realname/privatemsg_realname.module b/privatemsg_realname/privatemsg_realname.module
index 752147d..11f31d6 100644
--- a/privatemsg/privatemsg_realname/privatemsg_realname.module
+++ b/privatemsg/privatemsg_realname/privatemsg_realname.module
@@ -103,7 +103,7 @@ function theme_privatemsg_realname_username($variables) {
     $recipient->uid = $recipient->recipient;
   }
   if (!empty($options['plain'])) {
-    $name = check_plain(format_username($recipient));
+    $name = strip_tags(format_username($recipient));
     if (!empty($options['unique'])) {
       $identifier = variable_get('privatemsg_realname_unique_identifier', 'name');
       $name .= ' [user: ' . $recipient->$identifier . ']';