diff --git a/client/app/views/register/preset.coffee b/client/app/views/register/preset.coffee
index b2f26b4c..52cc16b8 100644
--- a/client/app/views/register/preset.coffee
+++ b/client/app/views/register/preset.coffee
@@ -47,12 +47,18 @@ module.exports = class RegisterPresetView extends FormView
         @initForm()
         @initErrors()
 
+        # Step valve
+        @onStep = @model.get('step').sampledBy(@form).map (step) ->
+            step is 'preset'
+        .toProperty()
+
+
         # Set the next button enable state when all required fields are filled
         @model.nextEnabled.plug @required.changes()
 
         # Create a new stream from the submit one that is filtered onto the step
         # (e.g. the form will not be submitted if we're already not in the step)
-        submit = @form.filter => @model.get('step').map (cur) -> cur is 'preset'
+        submit = @form.filter @onStep
         # We plug it to the signup stream and to the next button busy state (e.g
         # the busy state is enable when the form is submitted)
         @model.signup.plug submit
diff --git a/server/views/index.jade b/server/views/index.jade
index b50c99c8..e0dba1b5 100644
--- a/server/views/index.jade
+++ b/server/views/index.jade
@@ -2,7 +2,7 @@ extends layouts/_base
 
 block title
     title Cozy - Your Private Personal Cloud
-    meta(name="description", content="Cozy is an app-based personal cloud you can host at home. It allows you to own and connect your data. It turns a low-cost piece of hardware like a Raspberry Pi 2 or an online VPS into a powerful app platform. It comes with common applications like a contacts manager, calendar, webmail and filebox."
+    meta(name="description", content="Cozy is an app-based personal cloud you can host at home. It allows you to own and connect your data. It turns a low-cost piece of hardware like a Raspberry Pi 2 or an online VPS into a powerful app platform. It comes with common applications like a contacts manager, calendar, webmail and filebox.")
 
 
 block content