diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 28832713b..5c66bb43e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -19,6 +19,7 @@ class UsersController < ApplicationController
     if @user.is_anonymous?
       redirect_to new_session_path
     else
+      params[:action] = "edit"
       respond_with(@user, template: "users/edit")
     end
   end
@@ -53,6 +54,7 @@ class UsersController < ApplicationController
     @user = CurrentUser.user
 
     if @user.is_member?
+      params[:action] = "show"
       respond_with(@user, methods: @user.full_attributes, template: "users/show")
     elsif request.format.html?
       redirect_to new_session_path
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6ccc59144..921f183e5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -202,18 +202,18 @@ module ApplicationHelper
   def page_title
     if content_for(:page_title).present?
       content_for(:page_title)
-    elsif action_name == "index"
-      "#{controller_name.titleize} - #{Danbooru.config.app_name}"
-    elsif action_name == "show"
-      "#{controller_name.singularize.titleize} - #{Danbooru.config.app_name}"
-    elsif action_name == "new"
-      "New #{controller_name.singularize.titleize} - #{Danbooru.config.app_name}"
-    elsif action_name == "edit"
-      "Edit #{controller_name.singularize.titleize} - #{Danbooru.config.app_name}"
-    elsif action_name == "search"
-      "Search #{controller_name.titleize} - #{Danbooru.config.app_name}"
+    elsif params[:action] == "index"
+      "#{params[:controller].titleize} - #{Danbooru.config.app_name}"
+    elsif params[:action] == "show"
+      "#{params[:controller].singularize.titleize} - #{Danbooru.config.app_name}"
+    elsif params[:action] == "new"
+      "New #{params[:controller].singularize.titleize} - #{Danbooru.config.app_name}"
+    elsif params[:action] == "edit"
+      "Edit #{params[:controller].singularize.titleize} - #{Danbooru.config.app_name}"
+    elsif params[:action] == "search"
+      "Search #{params[:controller].titleize} - #{Danbooru.config.app_name}"
     else
-      "#{Danbooru.config.app_name}/#{controller_name}"
+      "#{Danbooru.config.app_name}/#{params[:controller]}"
     end
   end
 
diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb
index 1e8d6e897..07edfa111 100644
--- a/app/helpers/posts_helper.rb
+++ b/app/helpers/posts_helper.rb
@@ -35,7 +35,7 @@ module PostsHelper
   def post_search_count_js
     return nil unless post_search_counts_enabled?
     
-    if action_name == "index" && params[:page].nil?
+    if params[:action] == "index" && params[:page].nil?
       tags = Tag.scan_query(params[:tags]).sort.join(" ")
 
       if tags.present?