8 files changed, 24 insertions, 2 deletions
diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml
index 8e014760e..831e7f854 100644
--- a/app/views/about/index.html.haml
+++ b/app/views/about/index.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  = Rails.configuration.x.local_domain
+
 .wrapper
   %h1
     = image_tag 'logo.png'
@@ -16,4 +19,5 @@
     is a Mastodon instance.
 
   .actions
-    = link_to 'Get started', new_user_session_path, class: 'button'
+    = link_to 'Get started', new_user_registration_path, class: 'button'
+    = link_to 'Log in', new_user_session_path, class: 'button'
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index 5c1cf5734..e287f1528 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Confirmation instructions
+
 = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
   = devise_error_messages!
 
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index 0d5f0fe10..79a044acf 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Set new password
+
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
   = devise_error_messages!
   = f.hidden_field :reset_password_token
diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml
index 2677feea0..416870de8 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Reset password
+
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
   = devise_error_messages!
 
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 943230b34..9a52af35c 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Change password
+
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
   = devise_error_messages!
 
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index c8532ec38..97ab5498e 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Sign up
+
 = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
   = devise_error_messages!
 
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 220d0ec79..7cfd1cb68 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Log in
+
 = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
   .field
     = f.email_field :email, autofocus: true, placeholder: 'E-mail address', required: true
diff --git a/app/views/xrd/webfinger.xml.ruby b/app/views/xrd/webfinger.xml.ruby
index d633e3477..ee5b5fc9d 100644
--- a/app/views/xrd/webfinger.xml.ruby
+++ b/app/views/xrd/webfinger.xml.ruby
@@ -5,6 +5,6 @@ Nokogiri::XML::Builder.new do |xml|
     xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account))
     xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
     xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
-    xml.Link(rel: 'magic-public-key', href: @magic_key)
+    xml.Link(rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}")
   end
 end.to_xml