diff --git a/scm-ui/public/locales/en/groups.json b/scm-ui/public/locales/en/groups.json
index 3484134901..4f2cdbac92 100644
--- a/scm-ui/public/locales/en/groups.json
+++ b/scm-ui/public/locales/en/groups.json
@@ -30,7 +30,9 @@
     "label": "Edit"
   },
   "group-form": {
-    "submit": "Submit"
+    "submit": "Submit",
+    "name-error": "Group name is invalid",
+    "description-error": "Description is invalid"
   },
   "delete-group-button": {
     "label": "Delete",
diff --git a/scm-ui/src/groups/components/GroupForm.js b/scm-ui/src/groups/components/GroupForm.js
index 0477837604..7a9df2b4c5 100644
--- a/scm-ui/src/groups/components/GroupForm.js
+++ b/scm-ui/src/groups/components/GroupForm.js
@@ -44,19 +44,25 @@ class GroupForm extends React.Component<Props, State> {
     }
   }
 
-  onSubmit = (event: Event) => {
-    event.preventDefault();
-    this.props.submitForm(this.state.group);
-  };
+  isFalsy(value) {
+    if (!value) {
+      return true;
+    }
+    return false;
+  }
 
   isValid = () => {
     const group = this.state.group;
-    return !(this.state.nameValidationError || group.name);
+    return !(
+      this.state.nameValidationError || 
+      this.isFalsy(group.name) ||
+      this.isFalsy(group.description)
+    );
   };
 
   submit = (event: Event) => {
     event.preventDefault();
-    if (this.isValid) {
+    if (this.isValid()) {
       this.props.submitForm(this.state.group);
     }
   };
@@ -69,7 +75,7 @@ class GroupForm extends React.Component<Props, State> {
       nameField = (
         <InputField
         label={t("group.name")}
-        errorMessage="group name invalid" // TODO: i18n
+        errorMessage={t("group-form.name-error")}
         onChange={this.handleGroupNameChange}
         value={group.name}
         validationError={this.state.nameValidationError}
@@ -77,16 +83,16 @@ class GroupForm extends React.Component<Props, State> {
       );
     }
     return (   
-      <form onSubmit={this.onSubmit}>
+      <form onSubmit={this.submit}>
         {nameField}
         <InputField
           label={t("group.description")}
-          errorMessage=""
+          errorMessage={t("group-form.description-error")}
           onChange={this.handleDescriptionChange}
           value={group.description}
           validationError={false}
         />
-          <SubmitButton label={t("group-form.submit")} loading={loading}/>
+          <SubmitButton disabled={!this.isValid()} label={t("group-form.submit")} loading={loading}/>
       </form>
     );
   }