diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 6cbe0dd95..cee26ae32 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -44,7 +44,7 @@ class ZipdownController < ApplicationController
       if homework != nil
         unless homework.attachments.empty?
           zipfile = zip_homework_by_user homework
-          send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
+          send_file zipfile, :filename =>  homework.user.user_extensions.student_id + "_" + homework.user.lastname + homework.user.firstname + "_" + homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
         else
           render file: 'public/no_file_found.html'
         end