diff --git a/Changelog.md b/Changelog.md
index 558895a69..1b8a2a9db 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@
 * Display likes and reshares without login [#7583](https://github.com/diaspora/diaspora/pull/7583)
 * Fix invalid data in the database for user data export [#7614](https://github.com/diaspora/diaspora/pull/7614)
 * Fix local migration run without old private key [#7558](https://github.com/diaspora/diaspora/pull/7558)
+* Fix export not downloadable because the filename was resetted on access [#7622](https://github.com/diaspora/diaspora/pull/7622)
 
 ## Features
 * Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530)
diff --git a/app/uploaders/exported_photos.rb b/app/uploaders/exported_photos.rb
index ed46e0667..b19c4edb1 100644
--- a/app/uploaders/exported_photos.rb
+++ b/app/uploaders/exported_photos.rb
@@ -5,7 +5,6 @@
 #   the COPYRIGHT file.
 
 class ExportedPhotos < SecureUploader
-
   def store_dir
     "uploads/users"
   end
@@ -13,7 +12,4 @@ class ExportedPhotos < SecureUploader
   def filename
     "#{model.username}_photos_#{secure_token}.zip" if original_filename.present?
   end
-
-
-
 end
diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb
index 116a34110..53201d918 100644
--- a/app/uploaders/exported_user.rb
+++ b/app/uploaders/exported_user.rb
@@ -14,6 +14,6 @@ class ExportedUser < SecureUploader
   end
 
   def filename
-    "#{model.username}_diaspora_data_#{secure_token}.json.gz"
+    "#{model.username}_diaspora_data_#{secure_token}.json.gz" if original_filename.present?
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 0304d432d..d399929b1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -981,6 +981,17 @@ describe User, :type => :model do
     end
   end
 
+  describe "#export" do
+    it "doesn't change the filename when the user is saved" do
+      user = FactoryGirl.create(:user)
+
+      filename = user.export.filename
+      user.save!
+
+      expect(User.find(user.id).export.filename).to eq(filename)
+    end
+  end
+
   describe "queue_export" do
     it "queues up a job to perform the export" do
       user = FactoryGirl.create(:user)