diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index 254d2919e3fd0402b8f63dd3ee4669138e32fb81..7105e362758134aea73a4cd9927cd652911e126f 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import { addSolution, writeSolution, writeSolutionFile, addDocument, clearWrite } from '../../actions/homework';
 import './Forms.css';
 import ConfirmModal from '../forms/ConfirmModal';
+import { emptyMessage } from '../pages/Homework';
 
 class AddSolutionForm extends Component {
   constructor(props) {
@@ -22,46 +23,53 @@ class AddSolutionForm extends Component {
     const accepted = false;
     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}
         trigger={
-          <button id='task' onClick={() => { this.setState({ showModal: true }); }}>
+          <button
+            id='task'
+            onClick={() => { this.setState({ showModal: true }); }}
+          >
             <Icon name='external' />
             {this.props.tasktitle}
           </button>
         }
       >
         <Modal.Header>
-          {this.props.multiple ? 'Másik' : 'Új'} megoldás beadása a(z) {this.props.tasktitle} nevű feladathoz:
+          {this.props.multiple ? 'MĂĄsik megoldĂĄs' : 'MegoldĂĄs'} beadĂĄsa a(z) {this.props.tasktitle} nevĹą feladathoz:
         </Modal.Header>
         <Modal.Content>
           <Modal.Description style={{ marginBottom: '2em' }}>
             <Header as='h5'>Feladat leĂ­rĂĄsa:</Header>
             {sentences.map(s => (<p>{s}</p>))}
           </Modal.Description>
-          <Form>
-            <Form.Field
-              control={Input}
-              label='MegoldĂĄs cĂ­me:'
-              name='name'
-              onChange={e => this.props.writeSolution(e)}
-              value={name}
-              placeholder='Adj meg egy cĂ­met a beadandĂł megoldĂĄsodnak...'
-            />
-            <Form.Field
-              control={TextArea}
-              label='MegoldĂĄs leĂ­rĂĄsa:'
-              name='description'
-              onChange={e => this.props.writeSolution(e)}
-              value={description}
-              placeholder='Add meg a megoldĂĄs leĂ­rĂĄsĂĄt...'
-            />
-            <Form.Field>
-              <label>FĂĄjl:</label>
-              <Input type='file' onChange={e => this.props.writeSolutionFile(e)} />
-            </Form.Field>
-          </Form>
+          {this.props.disabled ?
+            emptyMessage(disabledText, undefined, undefined, this.props.disabled) :
+            <Form>
+              <Form.Field
+                control={Input}
+                label='MegoldĂĄs cĂ­me:'
+                name='name'
+                onChange={e => this.props.writeSolution(e)}
+                value={name}
+                placeholder='Adj meg egy cĂ­met a beadandĂł megoldĂĄsodnak...'
+              />
+              <Form.Field
+                control={TextArea}
+                label='MegoldĂĄs leĂ­rĂĄsa:'
+                name='description'
+                onChange={e => this.props.writeSolution(e)}
+                value={description}
+                placeholder='Add meg a megoldĂĄs leĂ­rĂĄsĂĄt...'
+              />
+              <Form.Field>
+                <label>FĂĄjl:</label>
+                <Input type='file' onChange={e => this.props.writeSolutionFile(e)} />
+              </Form.Field>
+            </Form>
+          }
         </Modal.Content>
         <Modal.Actions>
           <Button
diff --git a/src/components/pages/Homework.js b/src/components/pages/Homework.js
index 530a53395c90fbc339994202163ed4e1b66bf717..813992ab93a4739194cdfb614588be7674425fb0 100644
--- a/src/components/pages/Homework.js
+++ b/src/components/pages/Homework.js
@@ -120,6 +120,7 @@ class Homework extends Component {
                 tasktitle={task.title}
                 taskdesc={task.text}
                 multiple={this.getTaskDisplayStyle(task) !== 'can_submit'}
+                disabled={moment().isAfter(task.deadline)}
               />
             </Table.Cell>
             <Table.Cell>