diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index 7105e362758134aea73a4cd9927cd652911e126f..ce4ec712c5f7094f8d44cb94d4a53de80d459eac 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -77,6 +77,7 @@ class AddSolutionForm extends Component {
             color='red'
             onClick={() => {
               this.setState({ showModal: false });
+              this.props.clearWrite();
             }}
           >
             <Icon name='remove' /> MĂŠgse
@@ -95,6 +96,7 @@ class AddSolutionForm extends Component {
                     task, accepted, corrected, note, name, description, file,
                     });
                   this.setState({ showModal: false });
+                  this.props.clearWrite();
                   }
                 }
               />
@@ -104,11 +106,11 @@ class AddSolutionForm extends Component {
                 color='green'
                 disabled={(name === '' || description === '')}
                 onClick={() => {
-                  console.log()
                 this.props.addSolution({
                   task, accepted, corrected, note, name, description, file,
                   });
                 this.setState({ showModal: false });
+                this.props.clearWrite();
                 }
               }
               >
diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js
index 97977ecbf23aaa054ec5a15a93bfe97d8e105a07..8c16e82e051cb92e133b6df06a2e5e08aff29454 100644
--- a/src/components/forms/CorrectSolutionForm.js
+++ b/src/components/forms/CorrectSolutionForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Modal, Button, Icon, Checkbox, Form, TextArea, Header } from 'semantic-ui-react';
 import { connect } from 'react-redux';
-import { correctSolution, writeSolution, check } from '../../actions/homework';
+import { correctSolution, writeSolution, check, clearWrite } from '../../actions/homework';
 
 class CorrectSolutionForm extends Component {
   constructor(props) {
@@ -86,6 +86,7 @@ class CorrectSolutionForm extends Component {
             color='red'
             onClick={() => {
               this.setState({ showModal: false });
+              this.props.clearWrite();
             }}
           >
             <Icon name='remove' /> MĂŠgse
@@ -101,6 +102,7 @@ class CorrectSolutionForm extends Component {
                 this.props.correction.note,
               );
               this.setState({ showModal: false });
+              this.props.clearWrite();
             }}
           >
             <Icon name='checkmark' /> BeadĂĄs
@@ -117,4 +119,5 @@ export default connect(mapStateToProps, {
   correctSolution,
   writeSolution,
   check,
+  clearWrite,
 })(CorrectSolutionForm);
diff --git a/src/components/pages/Homework.js b/src/components/pages/Homework.js
index 813992ab93a4739194cdfb614588be7674425fb0..12f8fac4e7d4110d425cc360fd301691f168a555 100644
--- a/src/components/pages/Homework.js
+++ b/src/components/pages/Homework.js
@@ -54,11 +54,12 @@ const displayTypes = {
   },
 };
 
-export const emptyMessage = (header, text, marginBottom) => (
+export const emptyMessage = (header, text, marginBottom, warning) => (
   <Message
     style={{ marginBottom }}
-    icon='info'
+    icon={warning ? 'warning' : 'info'}
     info
+    warning={warning}
     header={header}
     content={text}
   />
@@ -275,7 +276,7 @@ class Homework extends Component {
               }}
           />
           {empty
-            ? emptyMessage(emptyHeaderText, emptyText, marginBottom)
+            ? emptyMessage(emptyHeaderText, emptyText, marginBottom, false)
             : this.renderHomeworksTable(active, staff)}
         </Container>
       </Segment>
diff --git a/src/reducers/CorrectSolutionReducer.js b/src/reducers/CorrectSolutionReducer.js
index 0578837592e065317b78ec748ae0044890b9837e..aa118c5ff1a56e67ba16ec85d246387c64282446 100644
--- a/src/reducers/CorrectSolutionReducer.js
+++ b/src/reducers/CorrectSolutionReducer.js
@@ -1,4 +1,4 @@
-import { WRITE_SOLUTION, CHECK } from '../actions/types';
+import { WRITE_SOLUTION, CHECK, CLEAR_WRITE } from '../actions/types';
 
 const INITIAL_STATE = {
   accepted: false,
@@ -11,6 +11,8 @@ export default (state = INITIAL_STATE, action) => {
       return { ...state, [action.target]: action.payload };
     case CHECK:
       return { ...state, accepted: !state.accepted };
+    case CLEAR_WRITE:
+      return INITIAL_STATE;
     default:
       return state;
   }