diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2eec8cf23..76fd30729 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
   
   protect_from_forgery :except => :receive
   
-  before_filter :set_friends_and_status
+  before_filter :set_friends_and_status, :except => [:create, :update]
   before_filter :count_requests
 
   layout :layout_by_resource
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index e8dd82889..e7c07d0ef 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -31,7 +31,7 @@ class AspectsController < ApplicationController
   def create
     @aspect = current_user.aspect params[:aspect]
     flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect."
-    respond_with :location => edit_aspect_path(@aspect)
+    respond_with :location => aspects_manage_path
   end
   
   def new