diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 71831c5380..ad00948da5 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -1,4 +1,6 @@
 class HelpController < ApplicationController
+  skip_before_action :authenticate_user!, :reject_blocked
+
   layout 'help'
 
   def index
diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml
index 8551496b98..0398afb4c1 100644
--- a/app/views/help/show.html.haml
+++ b/app/views/help/show.html.haml
@@ -1,3 +1,3 @@
 - page_title @file.humanize, *@category.split("/").reverse.map(&:humanize)
 .documentation.wiki
-  = markdown @markdown.gsub('$your_email', current_user.email)
+  = markdown @markdown.gsub('$your_email', current_user.try(:email) || "email@example.com")