diff --git a/scripts/registration.js b/scripts/registration.js
index 727d60116..386608992 100644
--- a/scripts/registration.js
+++ b/scripts/registration.js
@@ -17,6 +17,8 @@ function storeFormFieldValue(fieldId) {
 
 function storeFormFields() {
   storeFormFieldValue('username');
+  storeFormFieldValue('firstname');
+  storeFormFieldValue('lastname');
   storeFormFieldValue('email');
   storeFormFieldValue('password');
   storeFormFieldValue('confirm_password');
@@ -32,6 +34,8 @@ function restoreFormFieldValue(fieldId) {
 
 function restoreFormFields() {
   restoreFormFieldValue('username');
+  restoreFormFieldValue('firstname');
+  restoreFormFieldValue('lastname');
   restoreFormFieldValue('email');
   restoreFormFieldValue('password');
   restoreFormFieldValue('confirm_password');
@@ -40,6 +44,8 @@ function restoreFormFields() {
 
 function removeFromStorage() {
   localStorage.removeItem('username');
+  localStorage.removeItem('firstname');
+  localStorage.removeItem('lastname');
   localStorage.removeItem('email');
   localStorage.removeItem('password');
   localStorage.removeItem('confirm_password');