diff --git a/data/html/.gitkeep b/data/g/.gitkeep
similarity index 100%
rename from data/html/.gitkeep
rename to data/g/.gitkeep
diff --git a/data/html/index.html.blank b/data/g/index.html.blank
similarity index 85%
rename from data/html/index.html.blank
rename to data/g/index.html.blank
index 7d4ed2a..92a3013 100644
--- a/data/html/index.html.blank
+++ b/data/g/index.html.blank
@@ -5,7 +5,7 @@ Guest Book
 ==========
 
 If you visited my website, please sign my guestbook!
-<form action="g/submit" method="POST" accept-charset="UTF-8">
+<form action="submit" method="POST" accept-charset="UTF-8">
 Your name:
 <input name="name">
 
diff --git a/t0sig.py b/t0sig.py
index e63bff9..628851e 100644
--- a/t0sig.py
+++ b/t0sig.py
@@ -40,7 +40,7 @@ async def new_message(event):
 
     entry += '\n\n{}\n\n'.format(data['message'])
 
-    with open('data/html/index.html', 'a') as f:
+    with open('data/g/index.html', 'a') as f:
         f.write(entry)
 
     await event.reply('Entry added to t0.vc/g')
@@ -60,6 +60,9 @@ async def submit(request):
     except KeyError:
         raise web.HTTPBadRequest(reason='You are missing something.')
 
+    if not len(name) or not len(message):
+        raise web.HTTPBadRequest(reason='You are missing something.')
+
     if len(name) > 50:
         raise web.HTTPBadRequest(reason='Name is too long.')
     if len(website) > 100: