diff --git a/app/models/photo.rb b/app/models/photo.rb
index 7176ecbd6..cc9f3c412 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -20,7 +20,7 @@ class Photo < Post
     
     photo = Photo.new(params)
     photo.image.store! image_file
-    photo
+    photo.save
   end
   
   after_save :log_save_inspection 
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index af157647d..e118e0f84 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -11,9 +11,9 @@ class ImageUploader < CarrierWave::Uploader::Base
     %w(jpg jpeg gif png)
   end
 
-  def filename
-    model.id.to_s + File.extname(@filename)
-  end
+#  def filename
+#    model.id.to_s + File.extname(@filename)
+#  end
 
   version :thumb_small do
     process :resize_to_fill => [30,30]
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index cdcfe077f..ed6e8bb4e 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,6 +1,6 @@
 CarrierWave.configure do |config|
-  config.grid_fs_database = "#diaspora-#{Rails.env}"
-  config.grid_fs_host = 'localhost'
+  config.grid_fs_database = MongoMapper::database.name
+  config.grid_fs_host = MongoMapper::connection.host
   config.grid_fs_access_url = "/images"
   config.storage = :grid_fs
   #config.storage = :file