diff --git a/admin/src/client/Group/GroupModal.js b/admin/src/client/Group/GroupModal.js
index b8b1181..f1ff62e 100644
--- a/admin/src/client/Group/GroupModal.js
+++ b/admin/src/client/Group/GroupModal.js
@@ -180,7 +180,7 @@ class GroupModal extends Component {
     return (
       <Modal open={this.props.open} onClose={this.handleClose} centered={false}>
         <Modal.Header>
-          {this.props.editGroupId ? "Create Group" : "Edit Group"}
+          {this.props.editGroupId ? "Edit Group" : "Create Group"}
         </Modal.Header>
         <Modal.Content scrolling>
           <Modal.Description>
diff --git a/admin/src/client/System/SystemForm.js b/admin/src/client/System/SystemForm.js
index 4943ada..e2d49fb 100644
--- a/admin/src/client/System/SystemForm.js
+++ b/admin/src/client/System/SystemForm.js
@@ -60,6 +60,7 @@ class SystemForm extends Component {
       this.state.shortName = this.props.system.shortName;
       this.state.description = this.props.system.description;
       this.state.systemType = this.props.system.systemType;
+      this.state.city = this.props.system.city;
       this.state.state = this.props.system.state;
       this.state.county = this.props.system.county;
       this.state.country = this.props.system.country;