diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index e0b82c06a5ff2b87cfe98c23fb29cbdaa93205f9..8b73573e5dd996ce15e765769356ae1891c939c8 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -33,6 +33,7 @@ class AddSolutionForm extends Component {
     const sentences = this.props.taskdesc.split('\n');
     const note = '';
     const disabledText = 'A határidő lejárt, további beadás nem lehetséges.';
+
     return (
       <Modal
         open={this.state.showModal}
@@ -99,19 +100,16 @@ class AddSolutionForm extends Component {
                 button={
                   <Button
                     disabled={
-                      name === '' ||
-                      description === '' ||
-                      (file === '' ? false :
-                      !allowedFileTypes.includes(file.type) ||
-                      file.size > (maxFileSize) * (1024 ** 2)
-                      )
+                      !name || !description ||
+                      (!file ? false : !allowedFileTypes.includes(file.type) ||
+                      file.size > (maxFileSize) * (1024 ** 2))
                     }
                     inverted
                     color='green'
                   >
                     <Icon name='checkmark' /> BeadĂĄs
                   </Button>
-                    }
+                }
                 text='beadod az új megoldást, ami felülírja az előzőt'
                 onAccept={() => {
                   this.props.addSolution({
@@ -126,7 +124,11 @@ class AddSolutionForm extends Component {
               <Button
                 inverted
                 color='green'
-                disabled={(name === '' || description === '')}
+                disabled={
+                  !name || !description ||
+                  (!file ? false : !allowedFileTypes.includes(file.type) ||
+                  file.size > (maxFileSize) * (1024 ** 2))
+                }
                 onClick={() => {
                 this.props.addSolution({
                   task, accepted, corrected, note, name, description, file,
diff --git a/src/components/forms/ConfirmModal.js b/src/components/forms/ConfirmModal.js
index a78c45fc0d601321a99f90512c1c253734049f0d..39982524778006648790b533cd237f6668f8864e 100644
--- a/src/components/forms/ConfirmModal.js
+++ b/src/components/forms/ConfirmModal.js
@@ -45,10 +45,7 @@ class ConfirmModal extends Component {
           <Button
             color='green'
             inverted
-            onClick={() => { onAccept();
-                             this.close();
-                           }
-                    }
+            onClick={() => { onAccept(); this.close(); }}
           >
             <Icon name='checkmark' /> Igen
           </Button>