diff --git a/base.html b/base.html
index 574f3f3..c1e9b11 100644
--- a/base.html
+++ b/base.html
@@ -31,7 +31,7 @@
           <input type="text" name="email">
           <span class="help-block">we'll send you info about future events</span>
           <label class="checkbox text-info">
-            <input type="checkbox" name="paris"> Nov 2014 (Paris)
+            <input type="checkbox" name="paris"> Paris Nov.2014?
           </label>
           <button type="submit" class="btn">Send</button>
         </fieldset>
diff --git a/html/index.html b/html/index.html
index 0761f34..2aca86a 100644
--- a/html/index.html
+++ b/html/index.html
@@ -23,14 +23,15 @@
       <br /><br />
 
       <ul class="nav nav-list">
-      <form method="GET" action="http://clevo:8000/email">
+      <!-- WARNING: This only works for development system (localhost) -->
+      <form method="GET" action="http://localhost:8000/email">
         <fieldset>
           <legend>JOIN US</legend>
           <label class="text-info">Enter your email..</label>
           <input type="text" name="email">
           <span class="help-block">we'll send you info about future events</span>
           <label class="checkbox text-info">
-            <input type="checkbox" name="paris"> Nov 2014 (Paris)
+            <input type="checkbox" name="paris"> Paris Nov.2014?
           </label>
           <button type="submit" class="btn">Send</button>
         </fieldset>
diff --git a/server.js b/server.js
index f5ab049..81fbe28 100644
--- a/server.js
+++ b/server.js
@@ -14,7 +14,8 @@ function handler(req, res) {
 
   if (/^\/email\?/.test(req.url)) {
     var params = require('url').parse(req.url, true)
-    console.log('got email:', params.query)
+    if (params && params.query.email)   // @TODO: validate input
+      console.log('got email:', params.query)
     res.statusCode = 302
     res.setHeader('Location', '/')
     return res.end()