diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js
index d93330054cc91fa88f0045803c057bbbfd5abfce..341c4a33f63d41c2fa826089ace4174bfa9a5756 100644
--- a/src/components/forms/CorrectSolutionForm.js
+++ b/src/components/forms/CorrectSolutionForm.js
@@ -13,7 +13,7 @@ class CorrectSolutionForm extends Component {
 
   render() {
     const {
-      studentName, studentFullName, studentId, taskTitle, taskSolutions,
+      studentFullName, studentId, taskTitle, taskSolutions,
     } = this.props;
     const taskSolutionsProfile =
     taskSolutions.filter(solution => solution.created_by === studentId);
@@ -42,16 +42,19 @@ class CorrectSolutionForm extends Component {
             style={{ marginRight: '1.5em', marginTop: '1.5em' }}
             onClick={() => { this.setState({ showModal: true }); }}
           >
-            {studentName}
+            {studentFullName}
           </Button>
         }
       >
         <Modal.Header>
-          A(z) {taskTitle} nevĹą feladat {studentName} ĂĄltal beadott megoldĂĄsĂĄnak kijavĂ­tĂĄsa:
+          A(z) {taskTitle} nevĹą feladat {studentFullName} ĂĄltal beadott megoldĂĄsĂĄnak kijavĂ­tĂĄsa:
         </Modal.Header>
         <Modal.Content>
           <Header as='h5'>A megoldĂĄs leĂ­rĂĄsa:</Header>
-          {fileLink === null ? 'Nincs leĂ­rĂĄs.' : relevantDocument.description.split('\n')}
+          {(relevantDocument === undefined || relevantDocument === null)
+            && fileLink != null
+            ? 'Nincs leĂ­rĂĄs.'
+            : relevantDocument.description.split('\n')}
           <Header as='h5'>A beadott dokumentum:</Header>
           {fileLink === null ?
             <p>Nincs fĂĄjl.</p> :
diff --git a/src/components/forms/SolutionDetailsForm.js b/src/components/forms/SolutionDetailsForm.js
index f56dc4d4135ab1d616f2783ed567afbe20138629..e78054ffbd5a2c25fcb18028bb8dc9d384d2665c 100644
--- a/src/components/forms/SolutionDetailsForm.js
+++ b/src/components/forms/SolutionDetailsForm.js
@@ -57,7 +57,7 @@ class SolutionDetailsForm extends Component {
           {noSubmitStudents.length === 0 ?
               emptyMessage(emptyStudentText) :
               noSubmitStudents.map(student => (
-                <Button color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.nick}</Button>
+                <Button color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
               ))
           }
           <Header as='h3'>JavĂ­tĂĄsra vĂĄr (A nĂŠvre kattintva kijavĂ­thatĂł a megoldĂĄs):</Header>
@@ -77,14 +77,14 @@ class SolutionDetailsForm extends Component {
           {noAcceptStudents.length === 0 ?
             emptyMessage(emptyStudentText) :
             noAcceptStudents.map(student => (
-              <Button color='red' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.nick}</Button>
+              <Button color='red' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
             ))
         }
           <Header as='h3'>Elfogadva:</Header>
           {acceptedStudents.length === 0 ?
             emptyMessage(emptyStudentText) :
             acceptedStudents.map(student => (
-              <Button color='green' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.nick}</Button>
+              <Button color='green' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
             ))
         }
         </Modal.Content>