diff --git a/app/views/questions/index.html.haml b/app/views/questions/index.html.haml
index 82fbbcbe..0c46b2ff 100644
--- a/app/views/questions/index.html.haml
+++ b/app/views/questions/index.html.haml
@@ -1,5 +1,7 @@
 - content_for :head do
-  - unless @support
+  - if @support
+    = auto_discovery_link_tag :atom, support_questions_url(format: :atom)
+  - else
     = auto_discovery_link_tag :atom, questions_url(format: :atom)
 
 - content_for :title do
@@ -16,7 +18,10 @@
     = render :partial => "shared/support_blurb"
 
 - content_for :feed do
-  = link_to "Feed", questions_url(format: :atom)
+  - if @support
+    = link_to "Feed", support_questions_url(format: :atom)
+  - else
+    = link_to "Feed", questions_url(format: :atom)
 
 %ul.questions
   = render :partial => "list", :collection => collection
diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml
index 1f20859d..49e9154b 100644
--- a/app/views/users/_form.html.haml
+++ b/app/views/users/_form.html.haml
@@ -3,7 +3,7 @@
   = f.error_notification
   .inputs
     = f.input :username, :autofocus => true
-    = f.input :email, :autofocus => true
+    = f.input :email
   .inputs
     - pwd_options = resource.new_record? ? {} : {:hint => "Leave it blank if you don't want to change it"}
     = f.input :password, pwd_options.merge({:required => false})