diff --git a/routes/guestbook.js b/routes/guestbook.js
index eda4606..9b26394 100644
--- a/routes/guestbook.js
+++ b/routes/guestbook.js
@@ -27,7 +27,9 @@ async function handler(req, res, next) {
             current_route: req.originalUrl,
             ip: req.ip,
             data,
-            errors
+            errors,
+            name: req.session.gb_name,
+            email: req.session.gb_email
         }));
         return;
     } catch (err) {
@@ -64,8 +66,10 @@ async function submit(req, res, next) {
         return;
     }
 
-    // actual shit
+    req.session.gb_name = name;
+    req.session.gb_email = email;
 
+    // actual shit
     let records = await Sequelize.Guestbook.findAll({
         where: {
             ip: req.ip
diff --git a/view/guestbook.pug b/view/guestbook.pug
index 8bbb0b1..999b21c 100644
--- a/view/guestbook.pug
+++ b/view/guestbook.pug
@@ -20,12 +20,12 @@ block content
                         tr
                             td Your name:
                             td
-                                input(type='text' name='name' value='' style='width:50%')
+                                input(type='text' name='name' value='' + name style='width:50%')
                                 span(style='font-size:9pt;color:red;user-select:none' title='required')  *
                         tr
                             td Your email:
                             td
-                                input(type='email' name='email' value='')
+                                input(type='email' name='email' value='' + email)
                         tr
                             td Hide your email?
                             td