diff --git a/build/index.html b/build/index.html
index c37b4987..ade6aaf9 100644
--- a/build/index.html
+++ b/build/index.html
@@ -120,8 +120,11 @@
       <td class='code'>${name}</td>
       <td>
         <select name='${name}'>
+          {{if required == false }}
+          <option selected='selected' value=''></option>
+          {{/if}}
           {{each allowableValues}}
-          {{if $value == defaultValue }}
+          {{if $value == defaultValue && required == true}}
           <option selected='selected' value='${$value}'>${$value}</option>
           {{else}}
           <option value='${$value}'>${$value}</option>
diff --git a/source/index.html.haml b/source/index.html.haml
index 0e235e93..d0c2cd1b 100644
--- a/source/index.html.haml
+++ b/source/index.html.haml
@@ -77,8 +77,11 @@
     %td.code ${name}
     %td
       %select{:name => "${name}"}
+        {{if required == false }}
+        %option{:value => "", :selected => 'selected'}
+        {{/if}}
         {{each allowableValues}}
-        {{if $value == defaultValue }}
+        {{if $value == defaultValue && required == true }}
         %option{:value => "${$value}", :selected => 'selected'} ${$value}
         {{else}} 
         %option{:value => "${$value}"} ${$value}