diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 11b7fb404..be133bb53 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -7,6 +7,7 @@ class PhotosController < ApplicationController
   
   def create
     @photo = Photo.new(params[:photo])
+    @photo.person = current_user
     
     if @photo.save
       flash[:notice] = "Successfully uploaded photo."
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 2b70223cc..148251e8d 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -31,9 +31,8 @@ describe Photo do
     it 'should save a signed photo to GridFS' do
       photo = Photo.new(:person => @user)
       photo.image = File.open(@fixture_name)
-      #photo.creator_signature = photo.send(:sign)
-      photo.verify_creator_signature.should be true
       photo.save.should == true
+      photo.verify_creator_signature.should be true
     end
     
   end