diff --git a/app/views/admin/events/reports.html.haml b/app/views/admin/events/reports.html.haml
index f300d10c..09659f06 100644
--- a/app/views/admin/events/reports.html.haml
+++ b/app/views/admin/events/reports.html.haml
@@ -46,7 +46,7 @@
               %tr
                 - progress_status = event.progress_status
                 %td
-                  = link_to event.title, edit_conference_program_proposal_path(@conference.short_title, event)
+                  = link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
                   %br
                   .small (Presented by #{event.speaker_names})
 
@@ -76,7 +76,7 @@
           %tbody
             - @events_missing_commercial.each do |event|
               %tr
-                %td= link_to event.title, edit_conference_program_proposal_path(@conference.short_title, event)
+                %td= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
                 %td  #{event.speaker_names}
 
     #requirements.tab-pane
@@ -97,7 +97,7 @@
           %tbody
             - @events_with_requirements.each do |event|
               %tr
-                %td= link_to event.title, edit_conference_program_proposal_path(@conference.short_title, event)
+                %td= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
                 %td  #{event.speaker_names}
                 %td= event.description
 
@@ -122,6 +122,6 @@
               %tr
                 %td= speaker.user.name
                 %td= @conference.user_registered?(speaker.user) ? 'Yes' : 'No'
-                %td= link_to speaker.event.title, edit_conference_program_proposal_path(@conference.short_title, speaker.event)
+                %td= link_to speaker.event.title, edit_admin_conference_program_event_path(@conference.short_title, speaker.event)
                 - event_start_time = speaker.event.time
                 %td= event_start_time.present? ? event_start_time : '-'
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 36eeb6e3..3ef7c491 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -7,9 +7,9 @@
             Sign Up
         .panel-body
           = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
-            = f.input :username, input_html: { required: true }
+            = f.input :username, input_html: { required: true },hint: 'This is how the other users see you,not your real name.'
             = f.input :email, input_html: { required: true }
-            = f.input :name, input_html: { required: true }
+            = f.input :name, input_html: { required: true },hint: 'This is your real name.'
             = f.input :password, input_html: { required: true }
             = f.input :password_confirmation, input_html: { required: true }
             %p.text-right