diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9acef413a0..b2e49fb67a 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -918,6 +918,7 @@ export default React.createClass({
                 avatarNode = <GroupAvatar
                     groupId={this.props.groupId}
                     groupAvatarUrl={groupAvatarUrl}
+                    onClick={this._onEditClick}
                     width={48} height={48}
                 />;
                 if (summary.profile && summary.profile.name) {
diff --git a/src/components/views/avatars/GroupAvatar.js b/src/components/views/avatars/GroupAvatar.js
index 506714e857..3b716f02e1 100644
--- a/src/components/views/avatars/GroupAvatar.js
+++ b/src/components/views/avatars/GroupAvatar.js
@@ -28,6 +28,7 @@ export default React.createClass({
         width: PropTypes.number,
         height: PropTypes.number,
         resizeMethod: PropTypes.string,
+        onClick: PropTypes.func,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index ed143358e9..bda298ef0b 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -108,7 +108,7 @@ export default React.createClass({
             // rather than displaying what the server gives us, but synapse doesn't give
             // any yet.
             createErrorNode = <div className="error">
-                <div>{ _t('Room creation failed') }</div>
+                <div>{ _t('Something went wrong whilst creating your community') }</div>
                 <div>{ this.state.createError.message }</div>
             </div>;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a9f14151c9..1e8a7cadbc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -583,7 +583,7 @@
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
     "%(actionVerb)s this person?": "%(actionVerb)s this person?",
     "Community IDs may only contain alphanumeric characters": "Community IDs may only contain alphanumeric characters",
-    "Room creation failed": "Room creation failed",
+    "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
     "Create Community": "Create Community",
     "Community Name": "Community Name",
     "Example": "Example",