diff --git a/src/components/forms/EditAssignmentForm/EditAssignmentForm.js b/src/components/forms/EditAssignmentForm/EditAssignmentForm.js
index 4182a261f..2a27d425c 100644
--- a/src/components/forms/EditAssignmentForm/EditAssignmentForm.js
+++ b/src/components/forms/EditAssignmentForm/EditAssignmentForm.js
@@ -88,29 +88,6 @@ const EditAssignmentForm = ({
           />
         </Alert>}
 
-      <Field
-        name="name"
-        component={TextField}
-        label={
-          <FormattedMessage
-            id="app.editAssignmentForm.name"
-            defaultMessage="Assignment default name:"
-          />
-        }
-      />
-
-      <Field
-        name="isPublic"
-        component={CheckboxField}
-        onOff
-        label={
-          <FormattedMessage
-            id="app.editAssignmentForm.isPublic"
-            defaultMessage="Visible to students"
-          />
-        }
-      />
-
       <FieldArray
         name="localizedTexts"
         localizedTexts={localizedTexts}
@@ -250,6 +227,18 @@ const EditAssignmentForm = ({
           />
         }
       />
+
+      <Field
+        name="isPublic"
+        component={CheckboxField}
+        onOff
+        label={
+          <FormattedMessage
+            id="app.editAssignmentForm.isPublic"
+            defaultMessage="Visible to students"
+          />
+        }
+      />
     </FormBox>
   </div>;
 
@@ -296,15 +285,6 @@ const validate = ({
 }) => {
   const errors = {};
 
-  if (!name) {
-    errors['name'] = (
-      <FormattedMessage
-        id="app.editAssignmentForm.validation.emptyName"
-        defaultMessage="Please fill the name of the assignment."
-      />
-    );
-  }
-
   if (localizedTexts.length < 1) {
     errors['_error'] = (
       <FormattedMessage
@@ -325,6 +305,15 @@ const validate = ({
         />
       );
     } else {
+      if (!localizedTexts[i].name) {
+        localeErrors['name'] = (
+          <FormattedMessage
+            id="app.editAssignmentForm.validation.emptyName"
+            defaultMessage="Please fill the name of the assignment."
+          />
+        );
+      }
+
       if (!localizedTexts[i].locale) {
         localeErrors['locale'] = (
           <FormattedMessage
diff --git a/src/components/forms/EditExerciseForm/EditExerciseForm.js b/src/components/forms/EditExerciseForm/EditExerciseForm.js
index ebe8320c1..99acf18a7 100644
--- a/src/components/forms/EditExerciseForm/EditExerciseForm.js
+++ b/src/components/forms/EditExerciseForm/EditExerciseForm.js
@@ -12,12 +12,7 @@ import { Alert } from 'react-bootstrap';
 import Icon from 'react-fontawesome';
 import { LinkContainer } from 'react-router-bootstrap';
 
-import {
-  TextField,
-  SelectField,
-  CheckboxField,
-  MarkdownTextAreaField
-} from '../Fields';
+import { SelectField, CheckboxField } from '../Fields';
 
 import FormBox from '../../widgets/FormBox';
 import SubmitButton from '../SubmitButton';
@@ -126,15 +121,10 @@ const EditExerciseForm = ({
         />
       </Alert>}
 
-    <Field
-      name="name"
-      component={TextField}
-      label={
-        <FormattedMessage
-          id="app.editExerciseForm.name"
-          defaultMessage="Exercise name:"
-        />
-      }
+    <FieldArray
+      name="localizedTexts"
+      localizedTexts={localizedTexts}
+      component={LocalizedTextsFormField}
     />
 
     <Field
@@ -154,17 +144,6 @@ const EditExerciseForm = ({
       }
     />
 
-    <Field
-      name="description"
-      component={MarkdownTextAreaField}
-      label={
-        <FormattedMessage
-          id="app.editExerciseForm.description"
-          defaultMessage="Description for supervisors:"
-        />
-      }
-    />
-
     <Field
       name="isPublic"
       component={CheckboxField}
@@ -188,12 +167,6 @@ const EditExerciseForm = ({
         />
       }
     />
-
-    <FieldArray
-      name="localizedTexts"
-      localizedTexts={localizedTexts}
-      component={LocalizedTextsFormField}
-    />
   </FormBox>;
 
 EditExerciseForm.propTypes = {
@@ -216,15 +189,6 @@ EditExerciseForm.propTypes = {
 const validate = ({ name, description, difficulty, localizedTexts }) => {
   const errors = {};
 
-  if (!name) {
-    errors['name'] = (
-      <FormattedMessage
-        id="app.editExerciseForm.validation.emptyName"
-        defaultMessage="Please fill the name of the exercise."
-      />
-    );
-  }
-
   if (!difficulty) {
     errors['difficulty'] = (
       <FormattedMessage
@@ -234,15 +198,6 @@ const validate = ({ name, description, difficulty, localizedTexts }) => {
     );
   }
 
-  if (!description) {
-    errors['description'] = (
-      <FormattedMessage
-        id="app.editExerciseForm.validation.description"
-        defaultMessage="Please fill the description of the exercise."
-      />
-    );
-  }
-
   if (localizedTexts.length < 1) {
     errors['_error'] = (
       <FormattedMessage
@@ -263,6 +218,15 @@ const validate = ({ name, description, difficulty, localizedTexts }) => {
         />
       );
     } else {
+      if (!localizedTexts[i].name) {
+        localeErrors['name'] = (
+          <FormattedMessage
+            id="app.editExerciseForm.validation.emptyName"
+            defaultMessage="Please fill the name of the exercise."
+          />
+        );
+      }
+
       if (!localizedTexts[i].locale) {
         localeErrors['locale'] = (
           <FormattedMessage
@@ -280,6 +244,15 @@ const validate = ({ name, description, difficulty, localizedTexts }) => {
           />
         );
       }
+
+      if (!localizedTexts[i].description) {
+        localeErrors['description'] = (
+          <FormattedMessage
+            id="app.editExerciseForm.validation.description"
+            defaultMessage="Please fill the description of the exercise."
+          />
+        );
+      }
     }
 
     localizedTextsErrors[i] = localeErrors;
diff --git a/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js b/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js
index 1dd34cd66..34e6606d0 100644
--- a/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js
+++ b/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js
@@ -2,10 +2,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { Field } from 'redux-form';
-import { MarkdownTextAreaField, LanguageSelectField } from '../Fields';
+import {
+  MarkdownTextAreaField,
+  LanguageSelectField,
+  TextField
+} from '../Fields';
 
-const LocalizedTextFormField = ({ prefix }) => (
+const LocalizedTextFormField = ({ prefix }) =>
   <div>
+    <Field
+      name={`${prefix}.name`}
+      component={TextField}
+      label={
+        <FormattedMessage
+          id="app.editAssignmentForm.localized.name"
+          defaultMessage="Name:"
+        />
+      }
+    />
+
     <Field
       name={`${prefix}.locale`}
       component={LanguageSelectField}
@@ -27,8 +42,18 @@ const LocalizedTextFormField = ({ prefix }) => (
         />
       }
     />
-  </div>
-);
+
+    <Field
+      name={`${prefix}.description`}
+      component={MarkdownTextAreaField}
+      label={
+        <FormattedMessage
+          id="app.editAssignmentForm.description"
+          defaultMessage="Description for supervisors:"
+        />
+      }
+    />
+  </div>;
 
 LocalizedTextFormField.propTypes = {
   prefix: PropTypes.string.isRequired