diff --git a/app/views/conferences/_done.html.haml b/app/views/conferences/_done.html.haml
index 6ca184f..b8e7049 100644
--- a/app/views/conferences/_done.html.haml
+++ b/app/views/conferences/_done.html.haml
@@ -10,16 +10,16 @@
%table
%tr
%th=_'articles.conference_registration.headings.name'
- %td=_!current_user.firstname
+ %td=_!(current_user.firstname || '')
%tr
%th=_'articles.conference_registration.headings.location'
- %td=_!@registration.city
+ %td=_!(@registration.city || '')
%tr
%th=_'articles.conference_registration.headings.arrival'
- %td=date(@registration.arrival)
+ %td=date(@registration.arrival || @this_conference.start_date)
%tr
%th=_'articles.conference_registration.headings.departure'
- %td=date(@registration.departure)
+ %td=date(@registration.departure || @this_conference.end_date)
%tr
%th=_'articles.conference_registration.headings.languages'
%td=_!((JSON.parse(@registration.languages || '[]').map { |x| _"languages.#{x}" }).join(', ').to_s).html_safe
@@ -41,10 +41,10 @@
=_!@registration.allergies
%tr
%th=_'articles.conference_registration.headings.other'
- %td=_!@registration.other
+ %td=_!(@registration.other || '')
%tr
%th=_'articles.conference_registration.headings.payment'
- %td=_!('$' + @amount)
+ %td=_!('$' + (@amount || 0))
= form_tag register_path(@this_conference.slug) do
.actions
= button_tag :edit_registration, :value => :register
diff --git a/config/locales/data/html_records/Broadcast-message---1.html b/config/locales/data/html_records/Broadcast-message---1.html
index bb8edac..a8ab081 100644
--- a/config/locales/data/html_records/Broadcast-message---1.html
+++ b/config/locales/data/html_records/Broadcast-message---1.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html
index bb8edac..a8ab081 100644
--- a/config/locales/data/html_records/Broadcast-message--.html
+++ b/config/locales/data/html_records/Broadcast-message--.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
index f4ec143..4abbeb9 100644
--- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
+++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
@@ -77,7 +77,7 @@
-
+
@@ -93,7 +93,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
diff --git a/config/locales/data/html_records/Create-workshop---1.html b/config/locales/data/html_records/Create-workshop---1.html
index bb8edac..a8ab081 100644
--- a/config/locales/data/html_records/Create-workshop---1.html
+++ b/config/locales/data/html_records/Create-workshop---1.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html
index bb8edac..a8ab081 100644
--- a/config/locales/data/html_records/Create-workshop--.html
+++ b/config/locales/data/html_records/Create-workshop--.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/See-a-more-info-link---1.html b/config/locales/data/html_records/See-a-more-info-link---1.html
index 774ad71..db7b521 100644
--- a/config/locales/data/html_records/See-a-more-info-link---1.html
+++ b/config/locales/data/html_records/See-a-more-info-link---1.html
@@ -50,7 +50,7 @@
Halifax, Nova Scotia
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/See-a-register-link---1.html b/config/locales/data/html_records/See-a-register-link---1.html
index 8072a7e..fb1e6d7 100644
--- a/config/locales/data/html_records/See-a-register-link---1.html
+++ b/config/locales/data/html_records/See-a-register-link---1.html
@@ -41,7 +41,7 @@
Sackville, New Brunswick
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/See-a-register-link--.html b/config/locales/data/html_records/See-a-register-link--.html
index 774ad71..db7b521 100644
--- a/config/locales/data/html_records/See-a-register-link--.html
+++ b/config/locales/data/html_records/See-a-register-link--.html
@@ -50,7 +50,7 @@
Halifax, Nova Scotia
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page---1.html b/config/locales/data/html_records/Start-registration-from-landing-page---1.html
index 22993a1..6c7688c 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page---1.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page---1.html
@@ -41,7 +41,7 @@
Halifax, Nova Scotia
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--.html b/config/locales/data/html_records/Start-registration-from-landing-page--.html
index 8072a7e..fb1e6d7 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--.html
@@ -41,7 +41,7 @@
Sackville, New Brunswick
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
index 2a82964..aa858bd 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
@@ -80,7 +80,7 @@
@@ -94,7 +94,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
index 496af18..8880d9f 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
@@ -67,8 +67,8 @@
Departure date
-
-
+
+
Which languages do you speak?
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
index 2a82964..aa858bd 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
@@ -80,7 +80,7 @@
@@ -94,7 +94,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
diff --git a/config/locales/data/html_records/View-stats---1.html b/config/locales/data/html_records/View-stats---1.html
index 94bad7b..71aeb31 100644
--- a/config/locales/data/html_records/View-stats---1.html
+++ b/config/locales/data/html_records/View-stats---1.html
@@ -46,7 +46,7 @@
Anchorage, Alaska
-August 12 – 16, 2015
+August 13 – 17, 2015
diff --git a/config/locales/data/html_records/View-stats--.html b/config/locales/data/html_records/View-stats--.html
index 234a0c2..71aeb31 100644
--- a/config/locales/data/html_records/View-stats--.html
+++ b/config/locales/data/html_records/View-stats--.html
@@ -13,59 +13,57 @@
-
+
+
+
+