diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 156aac2eb8..e9cbf7945b 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -105,11 +105,11 @@ export default class UserProvider extends AutocompleteProvider {
         // Don't search if the query is a single "@"
         if (fullMatch && fullMatch !== '@') {
             completions = this.matcher.match(fullMatch).map((user) => {
-                const displayName = (user.name || user.userId || '').replace(' (IRC)', ''); // FIXME when groups are done
+                const displayName = (user.name || user.userId || '');
                 return {
                     // Length of completion should equal length of text in decorator. draft-js
                     // relies on the length of the entity === length of the text in the decoration.
-                    completion: user.rawDisplayName.replace(' (IRC)', ''),
+                    completion: user.rawDisplayName,
                     completionId: user.userId,
                     suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index e06ed5a22f..af7e8c4ae3 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -234,7 +234,7 @@ const Pill = React.createClass({
                     if (member) {
                         userId = member.userId;
                         member.rawDisplayName = member.rawDisplayName || '';
-                        linkText = member.rawDisplayName.replace(' (IRC)', ''); // FIXME when groups are done
+                        linkText = member.rawDisplayName;
                         if (this.props.shouldShowPillAvatar) {
                             avatar = <MemberAvatar member={member} width={16} height={16} />;
                         }
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 70c9c711fc..be40db50a1 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -109,9 +109,6 @@ export default React.createClass({
                 this.state.userGroups, this.state.relatedGroups,
             );
 
-            // Backwards-compatible replacing of "(IRC)" with AS user flair
-            name = displayedGroups.length > 0 ? name.replace(' (IRC)', '') : name;
-
             flair = <Flair key='flair'
                 userId={mxEvent.getSender()}
                 groups={displayedGroups}
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index d5e45386bd..c726f86808 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -361,7 +361,7 @@ export default class MessageComposerInput extends React.Component {
                     const selection = this.getSelectionRange(this.state.editorState);
                     const member = this.props.room.getMember(payload.user_id);
                     const completion = member ?
-                        member.rawDisplayName.replace(' (IRC)', '') : payload.user_id;
+                        member.rawDisplayName : payload.user_id;
                     this.setDisplayedCompletion({
                         completion,
                         completionId: payload.user_id,