diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index fdf59b41c..1ea79835b 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -153,9 +153,8 @@ class ProcessFeedService < BaseService
 
     status = Status.new(account: account, uri: target_id(xml), text: target_content(xml), url: target_url(xml), created_at: published(xml), updated_at: updated(xml))
     status.thread = find_original_status(xml, thread_id(xml))
-    status.save
 
-    if status.saved? && status.thread.nil? && !thread_href(xml).nil?
+    if status.save && status.thread.nil? && !thread_href(xml).nil?
       ThreadResolveWorker.perform_async(status.id, thread_href(xml))
     end
 
diff --git a/config/application.rb b/config/application.rb
index f6a5f6f9e..b1c9d9f6f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,5 +31,9 @@ module Mastodon
     config.middleware.use Rack::Deflater
 
     config.browserify_rails.commandline_options = "--transform [ babelify --presets [ es2015 react ] ] --extension=\".jsx\""
+
+    config.to_prepare do
+      Doorkeeper::AuthorizationsController.layout 'auth'
+    end
   end
 end