diff --git a/app/models/photo.rb b/app/models/photo.rb
index 6c96e425c..1eb0aa10e 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -34,15 +34,11 @@ class Photo < Post
   before_destroy :ensure_user_picture
 
   def self.instantiate(params = {})
+    photo = super(params)
     image_file = params.delete(:user_file)
-    person = params.delete(:person)
-
-    photo = Photo.new(params)
-    photo.diaspora_handle = params[:diaspora_handle]
 
+    photo.album_id = params[:album_id]
     photo.image.store! image_file
-    photo.person = person
-    photo.save
     photo
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 0ec7ed50b..9784a480f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -138,39 +138,38 @@ class User
   end
 
   ######## Posting ########
-  def post(class_name, options = {})
-    if class_name == :photo && !options[:album_id].to_s.empty?
-      aspect_ids = aspects_with_post(options[:album_id])
-      aspect_ids.map! { |aspect| aspect.id }
-    else
-      aspect_ids = options.delete(:to)
-    end
-
-    aspect_ids = validate_aspect_permissions(aspect_ids)
-
-    post = build_post(class_name, options)
+  def post(class_name, opts = {})
+    post = build_post(class_name, opts)
 
     if post.save
       raise 'MongoMapper failed to catch a failed save' unless post.id
-      dispatch_post(post, :to => aspect_ids)
+      dispatch_post(post, :to => opts[:to])
     end
     post
   end
 
-  def build_post(class_name, options = {})
-    options[:person] = self.person
-    options[:diaspora_handle] = self.person.diaspora_handle
+  def build_post(class_name, opts = {})
+    opts[:person] = self.person
+    opts[:diaspora_handle] = self.person.diaspora_handle
 
     model_class = class_name.to_s.camelize.constantize
-    model_class.instantiate(options)
+    model_class.instantiate(opts)
   end
 
   def dispatch_post(post, opts = {})
+    if post.is_a?(Photo) && post.album_id
+      aspect_ids = aspects_with_post(post.album_id)
+      aspect_ids.map! { |aspect| aspect.id }
+    else
+      aspect_ids = opts.delete(:to)
+    end
+
+    aspect_ids = validate_aspect_permissions(aspect_ids)
     self.raw_visible_posts << post
     self.save
     Rails.logger.info("Pushing: #{post.inspect} out to aspects")
-    push_to_aspects(post, opts[:to])
-    post.socket_to_uid(id, :aspect_ids => opts[:to]) if post.respond_to?(:socket_to_uid)
+    push_to_aspects(post, aspect_ids)
+    post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
     if post.public
       self.services.each do |service|
         self.send("post_to_#{service.provider}".to_sym, service, post.message)
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index f0e38fa42..0e2513e1d 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -42,15 +42,18 @@ describe Photo do
     it 'sets the persons diaspora handle' do
       @photo2.diaspora_handle.should == @user.person.diaspora_handle
     end
+    it 'has a constructor' do
+      image = File.open(@fixture_name)
+      photo = Photo.instantiate(
+                :person => @user.person, :album => @album, :user_file => image)
+      photo.created_at.nil?.should be true
+      photo.image.read.nil?.should be false
+      photo.album.should == @album
+    end
+
   end
 
-  it 'has a constructor' do
-    image = File.open(@fixture_name)
-    photo = Photo.instantiate(
-              :person => @user.person, :album => @album, :user_file => image)
-    photo.created_at.nil?.should be false
-    photo.image.read.nil?.should be false
-  end
+
 
   it 'should save a photo' do
     @photo.image.store! File.open(@fixture_name)