diff --git a/app/models/photo.rb b/app/models/photo.rb
index e9790cd9f..6c96e425c 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -38,6 +38,7 @@ class Photo < Post
     person = params.delete(:person)
 
     photo = Photo.new(params)
+    photo.diaspora_handle = params[:diaspora_handle]
 
     photo.image.store! image_file
     photo.person = person
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index c3fc927a2..f0e38fa42 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -17,6 +17,8 @@ describe Photo do
     @photo = Photo.new(:album => @album)
     @photo.person = @user.person
     @photo.diaspora_handle = @user.person.diaspora_handle
+
+    @photo2 = @user.post(:photo, :user_file=> File.open(@fixture_name), :to => @aspect.id)
   end
 
   describe "protected attributes" do
@@ -36,6 +38,12 @@ describe Photo do
     @photo.mutable?.should == true   
   end
 
+  describe '.instantiate' do
+    it 'sets the persons diaspora handle' do
+      @photo2.diaspora_handle.should == @user.person.diaspora_handle
+    end
+  end
+
   it 'has a constructor' do
     image = File.open(@fixture_name)
     photo = Photo.instantiate(