diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 71deaf529b..f51e21a9ad 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -71,29 +71,42 @@ module.exports = React.createClass({
             return <Loader />;
         } else if (this.state.summary) {
             const summary = this.state.summary;
-            let avatarUrl = null;
+            let avatarNode = null;
             if (summary.profile && summary.profile.avatar_url) {
-                avatarUrl = MatrixClientPeg.get().mxcUrlToHttp(summary.profile.avatar_url);
+                avatarNode = <BaseAvatar
+                    url={MatrixClientPeg.get().mxcUrlToHttp(summary.profile.avatar_url)}
+                    name={summary.profile.name}
+                    width={48} height={48}
+                />;
             }
             let description = null;
             if (summary.profile && summary.profile.long_description) {
                 description = sanitizedHtmlNode(summary.profile.long_description);
             }
+
+            let nameNode;
+            if (summary.profile.name) {
+                nameNode = <div className="mx_RoomHeader_name">
+                    <span>{summary.profile.name}</span>
+                    <span className="mx_GroupView_header_groupid">
+                        ({this.props.groupId})
+                    </span>
+                </div>;
+            } else {
+                nameNode = <div className="mx_RoomHeader_name">
+                    <span>{this.props.groupId}</span>
+                </div>;
+            }
+
             return (
                 <div className="mx_GroupView">
                     <div className="mx_RoomHeader">
                         <div className="mx_RoomHeader_wrapper">
                             <div className="mx_RoomHeader_avatar">
-                                <BaseAvatar url={avatarUrl} name={summary.profile.name}
-                                    width={48} height={48} />
+                                {avatarNode}
                             </div>
                             <div className="mx_RoomHeader_info">
-                                <div className="mx_RoomHeader_name">
-                                    <span>{summary.profile.name}</span>
-                                    <span className="mx_GroupView_header_groupid">
-                                        ({this.props.groupId})
-                                    </span>
-                                </div>
+                                {nameNode}
                                 <div className="mx_RoomHeader_topic">
                                     {summary.profile.short_description}
                                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6593c5aab8..e4a13e0689 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -927,5 +927,14 @@
   "This Home server does not support groups": "This Home server does not support groups",
   "Loading device info...": "Loading device info...",
   "Groups": "Groups",
-  "Create a new group": "Create a new group"
+  "Create a new group": "Create a new group",
+  "Create Group": "Create Group",
+  "Group Name": "Group Name",
+  "Example": "Example",
+  "Create": "Create",
+  "Group ID": "Group ID",
+  "+example:%(domain)s": "+example:%(domain)s",
+  "Group IDs must be of the form +localpart:%(domain)s": "Group IDs must be of the form +localpart:%(domain)s",
+  "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
+  "Room creation failed": "Room creation failed"
 }