diff --git a/codemeta_generation.js b/codemeta_generation.js
index eaf7ccd..55d5630 100644
--- a/codemeta_generation.js
+++ b/codemeta_generation.js
@@ -1,142 +1,155 @@
 /**
  * Copyright (C) 2019  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 "use strict";
 
 function emptyToUndefined(v) {
     if (v == null || v == "")
         return undefined;
     else
         return v;
 }
 
 function getIfSet(query) {
     return emptyToUndefined(document.querySelector(query).value);
 }
 
 function setIfDefined(query, value) {
     if (value !== undefined) {
         document.querySelector(query).value = value;
     }
 }
 
 // Names of codemeta properties with a matching HTML field name
 const directCodemetaFields = [
     'codeRepository',
     'contIntegration',
     'dateCreated',
     'datePublished',
     'dateModified',
     'issueTracker',
     'name',
     'version',
 ];
 
 // Names of codemeta properties with a matching HTML field name,
 // in a Person object
 const directPersonCodemetaFields = [
     'givenName',
     'familyName',
     'email',
 ];
 
 function generatePerson(idPrefix) {
     var doc = {
         "@type": "Person",
         "@id": getIfSet(`#${idPrefix}_id`),
     }
     directPersonCodemetaFields.forEach(function (item, index) {
         doc[item] = getIfSet(`#${idPrefix}_${item}`);
     });
 
     return doc;
 }
 
 function generatePersons(prefix) {
     var persons = [];
     var nbPersons = getNbPersons(prefix);
 
     for (let personId = 1; personId <= nbPersons; personId++) {
         persons.push(generatePerson(`${prefix}_${personId}`));
     }
 
     return persons;
 }
 
 function generateCodemeta() {
     var inputForm = document.querySelector('#inputForm');
     var codemetaText, errorHTML;
 
     if (inputForm.checkValidity()) {
         var doc = {
             "@context": "https://doi.org/10.5063/schema/codemeta-2.0",
             "@type": "SoftwareSourceCode",
             "license": "https://spdx.org/licenses/" + getIfSet('#license'),
         };
 
         // Generate most fields
         directCodemetaFields.forEach(function (item, index) {
             doc[item] = getIfSet('#' + item)
         });
 
         // Generate dynamic fields
         doc = Object.assign(doc, {
             "author": generatePersons('author'),
             "contributor": generatePersons('contributor'),
         });
 
         codemetaText = JSON.stringify(doc, null, 4);
         errorHTML = "";
     }
     else {
         codemetaText = "";
         errorHTML = "invalid input (see error above)";
         inputForm.reportValidity();
     }
 
     document.querySelector('#codemetaText').innerText = codemetaText;
     setError(errorHTML);
+
+    if (codemetaText) {
+        // For restoring the form state on page reload
+        sessionStorage.setItem('codemetaText', codemetaText);
+    }
 }
 
 function importPersons(prefix, legend, docs) {
     if (docs === 'undefined') {
         return;
     }
 
     docs.forEach(function (doc, index) {
         var personId = addPerson(prefix, legend);
 
         setIfDefined(`#${personId}_id`, doc['@id']);
         directPersonCodemetaFields.forEach(function (item, index) {
             setIfDefined(`#${prefix}_${personId}_${item}`, doc[item]);
         });
     })
 }
 
 function importCodemeta() {
     var inputForm = document.querySelector('#inputForm');
     var codemetaText = document.querySelector('#codemetaText').innerText;
     var doc;
 
     try {
         doc = JSON.parse(codemetaText);
     }
     catch (e) {
         setError(`Could not read codemeta document because it is not valid JSON (${e})`);
         return;
     }
     resetForm();
 
     directCodemetaFields.forEach(function (item, index) {
         setIfDefined('#' + item, doc[item]);
     });
 
     importPersons('author', 'Author', doc['author'])
     importPersons('contributor', 'Contributor', doc['contributor'])
 
     setError("");
 }
+
+function loadStateFromStorage() {
+    codemetaText = sessionStorage.getItem('codemetaText')
+    if (codemetaText) {
+        document.querySelector('#codemetaText').innerText = codemetaText;
+        importCodemeta();
+    }
+}
diff --git a/index.html b/index.html
index 2ea8ae8..ac2353f 100644
--- a/index.html
+++ b/index.html
@@ -1,141 +1,142 @@
 <!doctype html>
 <!--
 Copyright (C) 2019  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 -->
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <title>CodeMeta generator</title>
     <script src="./utils.js"></script>
     <script src="./dynamic_form.js"></script>
     <script src="./codemeta_generation.js"></script>
     <link rel="stylesheet" type="text/css" href="./style.css">
 </head>
 <body>
     <h1>CodeMeta generator</h1>
 
     <p>Most fields are optional. Mandatory fields will be highlighted when generating Codemeta.</p>
 
     <form id="inputForm">
         <fieldset id="fieldsetSoftwareItself">
             <legend>The software itself</legend>
 
             <p title="The name of the software">
                 <label for="name">Name</label>
                 <input type="text" name="name" id="name"
                     placeholder="My Software" required="true" />
             </p>
 
             <p title="The date on which the software was created.">
                 <label for="dateCreated">Creation date</label>
                 <input type="date" name="dateCreated" id="dateCreated"
                     placeholder="YYYY-MM-DD" pattern="\d{4}-\d{2}-\d{2}" />
             </p>
 
             <p title="Date of first publication.">
                 <label for="datePublished">First release date</label>
                 <input type="date" name="datePublished" id="datePublished"
                     placeholder="YYYY-MM-DD" pattern="\d{4}-\d{2}-\d{2}" />
             </p>
 
             <p>
                 <label for="license">License</label>
                 <select name="license" id="license">
                     <optgroup label="GNU licenses (LGPL/GPL/AGPL)">
                         <option value="GPL-2.0-only">GPL v2.0</option>
                         <option value="GPL-2.0-or-later">GPL v2.0 or later</option>
                         <option value="GPL-3.0-only">GPL v3.0</option>
                         <option value="GPL-3.0-or-later">GPL v3.0 or later</option>
                     </optgroup>
                     <optgroup label="Non-copyleft licenses">
                         <option value="MIT">MIT</option>
                         <option value="Apache-2.0">Apache 2.0</option>
                     </optgroup>
                 </select>
             </p>
         </fieldset>
 
         <fieldset id="fieldsetDevelopmentCommunity">
             <legend>Development community / tools</legend>
 
             <p title="Link to the repository where the un-compiled, human readable code and related code is located (SVN, Git, GitHub, CodePlex, institutional GitLab instance, etc.).">
                 <label for="codeRepository">Code repository</label>
                 <input type="URL" name="codeRepository" id="codeRepository"
                     placeholder="git+https://github.com/You/RepoName.git" />
             </p>
 
             <p title="Link to continuous integration service (Travis-CI, Gitlab CI, etc.).">
                 <label for="contIntegration">Continuous integration</label>
                 <input type="URL" name="contIntegration" id="contIntegration"
                     placeholder="https://travis-ci.org/You/RepoName" />
             </p>
 
             <p title="Link to a place for users/developpers to report and manage bugs (JIRA, GitHub issues, etc.).">
                 <label for="issueTracker">Issue tracker</label>
                 <input type="URL" name="issueTracker" id="issueTracker"
                     placeholder="https://github.com/You/RepoName/issues" />
             </p>
         </fieldset>
 
         <fieldset id="fieldsetCurrentVersion">
             <legend>Current version of the software</legend>
 
             <p title="Version number of the software">
                 <label for="version">Version number</label>
                 <input type="text" name="version" id="version"
                     placeholder="1.0.0" />
             </p>
 
             <p title="The date on which the software was most recently modified.">
                 <label for="dateModified">Release date</label>
                 <input type="date" name="dateModified" id="dateModified"
                     placeholder="YYYY-MM-DD" pattern="\d{4}-\d{2}-\d{2}" />
             </p>
         </fieldset>
 
         <fieldset class="persons" id="author_container">
             <legend>Authors</legend>
 
             <p>Order of authors does not matter.</p>
 
             <input type="hidden" id="author_nb" value="0" />
             <div id="addRemoveAuthor">
                 <input type="button" id="author_add" value="Add one"
                     onclick="addPerson('author', 'Author');" />
                 <input type="button" id="author_remove" value="Remove last"
                     onclick="removePerson('author');" />
             </div>
         </fieldset>
 
         <fieldset class="persons" id="contributor_container">
             <legend>Contributors</legend>
 
             <p>Order of contributors does not matter.</p>
 
             <input type="hidden" id="contributor_nb" value="0" />
             <div id="addRemoveContributor">
                 <input type="button" id="contributor_add" value="Add one"
                     onclick="addPerson('contributor', 'Contributor');" />
                 <input type="button" id="contributor_remove" value="Remove last"
                     onclick="removePerson('contributor');" />
             </div>
         </fieldset>
     </form>
     <form>
         <input type="button" id="generateCodemeta" value="Generate Codemeta" />
         <input type="button" id="resetForm" value="Reset form" />
         <input type="button" id="importCodemeta" value="Import Codemeta" />
     </form>
 
     <p id="errorMessage">
     </p>
     <pre contentEditable="true" id="codemetaText"></pre>
 
     <script>
         initCallbacks();
+        loadStateFromStorage();
     </script>
 </body>
 </html>