diff --git a/web/templates/public/booking.gohtml b/web/templates/public/booking.gohtml
index 48e3ec8..f5c82b3 100644
--- a/web/templates/public/booking.gohtml
+++ b/web/templates/public/booking.gohtml
@@ -20,6 +20,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Address -}}
                     <label>
@@ -28,6 +29,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .PostalCode -}}
                     <label>
@@ -36,6 +38,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .City -}}
                     <label>
@@ -44,6 +47,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Country -}}
                     <label>
@@ -54,6 +58,7 @@
                             {{ template "error-attrs" . }}>{{ template "list-options" . }}
                         </select><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Email -}}
                     <label>
@@ -62,6 +67,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Phone -}}
                     <label>
@@ -70,6 +76,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
             </fieldset>
             <fieldset>
@@ -81,6 +88,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Teenagers -}}
                     <label>
@@ -89,6 +97,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Children -}}
                     <label>
@@ -97,6 +106,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Dogs -}}
                     <label>
@@ -105,14 +115,17 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
             </fieldset>
             <fieldset>
                 <legend>{{( pgettext "Accomodation" "title" )}}</legend>
                 {{ range .CampsiteType.Options -}}
                     <label><input type="radio" name="{{ $.Form.CampsiteType.Name }}" value="{{ .Value }}"
+                                {{ if $.Form.CampsiteType.IsSelected .Value }}checked{{ end }}
                         > {{ .Label }}</label><br>
                 {{- end }}
+                {{ template "error-message" .CampsiteType }}
             </fieldset>
             {{ range .CampsiteType.Options -}}
                 {{ $options := index $.Form.CampsiteTypeOptions .Value }}
@@ -128,6 +141,7 @@
                                         {{ template "error-attrs" .Input }}
                                 ><br>
                             </label>
+                            {{ template "error-message" .Input }}
                         {{- end }}
                     </fieldset>
                 {{- end }}
@@ -141,6 +155,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .DepartureDate -}}
                     <label>
@@ -149,6 +164,7 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .AreaPreferences -}}
                     <label>
@@ -157,18 +173,21 @@
                                name="{{ .Name }}" value="{{ .Val }}" {{ template "error-attrs" . }}
                         ><br>
                     </label>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .ACSICard -}}
                     <label>
                         <input type="checkbox" name="{{ .Name }}" {{ if .Checked}}checked{{ end }}
                                 {{ template "error-attrs" . }}
                         > {{( pgettext "ACSI card? (optional)" "input" )}}</label><br>
+                    {{ template "error-message" . }}
                 {{- end }}
                 {{ with .Agreement -}}
                     <label>
                         <input type="checkbox" required name="{{ .Name }}" {{ if .Checked}}checked{{ end }}
                                 {{ template "error-attrs" . }}
                         > {{( pgettext "I have read and I accept the reservation conditions" "input" )}}</label><br>
+                    {{ template "error-message" . }}
                 {{- end }}
             </fieldset>
             <footer>