diff --git a/assets/javascripts/wizard/templates/custom.step.hbs b/assets/javascripts/wizard/templates/custom.step.hbs
index cd4bec24..3c26bf5c 100644
--- a/assets/javascripts/wizard/templates/custom.step.hbs
+++ b/assets/javascripts/wizard/templates/custom.step.hbs
@@ -1,13 +1,15 @@
-<div class="step-message {{stepMessage.state}}">
-  <div class="text">
-    {{stepMessage.text}}
+{{#if stepMessage}}
+  <div class="step-message {{stepMessage.state}}">
+    <div class="text">
+      {{stepMessage.text}}
+    </div>
+    {{#if showReset}}
+      <a class="reset-wizard" {{action "resetWizard"}}>
+        {{i18n 'wizard.reset'}}
+      </a>
+    {{/if}}
   </div>
-  {{#if showReset}}
-    <a class="reset-wizard" {{action "resetWizard"}}>
-      {{i18n 'wizard.reset'}}
-    </a>
-  {{/if}}
-</div>
+{{/if}}
 {{#if step.permitted}}
   {{wizard-step step=step
                 wizard=wizard
diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss
index db17c350..dd4212e6 100644
--- a/assets/stylesheets/wizard/wizard_custom.scss
+++ b/assets/stylesheets/wizard/wizard_custom.scss
@@ -119,6 +119,8 @@
   }
 
   .wizard-field {
+    margin-bottom: 1em;
+    
     &.tip {
       margin-top: auto;
     }