diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 6f9642f..3fcee17 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -188,7 +188,18 @@ class CmsController < MyProfileController
     end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
-        @uploaded_files << UploadedFile.create({:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user}, :without_protection => true) unless file == ''
+        unless file == ''
+          @uploaded_files << UploadedFile.create(
+            {
+              :uploaded_data => file,
+              :profile => profile,
+              :parent => @parent,
+              :last_changed_by => user,
+              :created_by => user,
+            },
+            :without_protection => true
+          )
+        end
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 6caa660..f28a1a1 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -321,6 +321,14 @@ class CmsControllerTest < ActionController::TestCase
     assert_equal 'test.txt', f.children[0].name
   end
 
+  should 'set author of uploaded files' do
+    f = Folder.new(:name => 'f'); profile.articles << f; f.save!
+    post :upload_files, :profile => profile.identifier, :parent_id => f.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
+
+    uf = profile.articles.find_by_name('test.txt')
+    assert_equal profile, uf.author
+  end
+
   should 'display destination folder of files when uploading file in root folder' do
     get :upload_files, :profile => profile.identifier
 
--
libgit2 0.21.2