diff --git a/src/components/forms/AddTaskForm.js b/src/components/forms/AddTaskForm.js
index 9c93fde609b24a13ebdf0190a866f445a041b13e..f08b1b351627cd274bf9aba40fa4666bb196b865 100644
--- a/src/components/forms/AddTaskForm.js
+++ b/src/components/forms/AddTaskForm.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Modal, Button, Form, Input, TextArea, Icon } from 'semantic-ui-react';
 import { connect } from 'react-redux';
 import { DateTimeInput } from 'semantic-ui-calendar-react';
+import moment from 'moment';
 import { addTask, writeTask, writeTaskDeadline, clearWrite } from '../../actions/homework';
 
 class AddTaskForm extends Component {
@@ -49,7 +50,7 @@ class AddTaskForm extends Component {
             />
             <Form.Field
               control={DateTimeInput}
-              label='Beadási határidő:'
+              label='Beadási határidő (a jelenlegi időnél későbbi időpont):'
               name='deadline'
               placeholder='Beadási határidő'
               iconPosition='left'
@@ -75,6 +76,7 @@ class AddTaskForm extends Component {
           <Button
             inverted
             color='green'
+            disabled={(title === '' || text === '' || deadline === '' || moment().isAfter(deadline))}
             onClick={() => {
               this.props.addTask({ title, text, deadline });
               this.setState({ showModal: false });
diff --git a/src/components/forms/EditTaskForm.js b/src/components/forms/EditTaskForm.js
index c1592f6e01fe5dcb81726a4bfcaebc040783428e..4f7ed08a71d3d58c1bc9d2294ece65fe7ca4d7a2 100644
--- a/src/components/forms/EditTaskForm.js
+++ b/src/components/forms/EditTaskForm.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Modal, Button, Form, Input, TextArea, Icon } from 'semantic-ui-react';
 import { connect } from 'react-redux';
 import { DateTimeInput } from 'semantic-ui-calendar-react';
+import moment from 'moment';
 import { writeTask, writeTaskDeadline, editTask, clearWrite } from '../../actions/homework';
 
 class EditTaskForm extends Component {
@@ -55,7 +56,7 @@ class EditTaskForm extends Component {
             />
             <Form.Field
               control={DateTimeInput}
-              label='Beadási határidő:'
+              label='Beadási határidő (a jelenlegi időnél későbbi időpont):'
               name='deadline'
               placeholder='Beadási határidő'
               iconPosition='left'
@@ -81,6 +82,7 @@ class EditTaskForm extends Component {
           <Button
             inverted
             color='green'
+            disabled={(title === '' || text === '' || deadline === '' || moment().isAfter(deadline))}
             onClick={() => {
               this.props.editTask({
                 id,