diff --git a/core/server/controllers/admin.js b/core/server/controllers/admin.js
index c0df9e6395..eb554eb2b6 100644
--- a/core/server/controllers/admin.js
+++ b/core/server/controllers/admin.js
@@ -84,19 +84,24 @@ adminControllers = {
             // adds directories recursively
             fs.mkdirs(dir, function (err) {
                 if (err) {
-                    errors.logError(err);
-                } else {
-                    fs.copy(tmp_path, target_path, function (err) {
-                        if (err) {
-                            errors.logError(err);
-                        } else {
-                            // TODO: should delete temp file at tmp_path. Or just move the file instead of copy.
-                            // the src for the image must be in URI format, not a file system path, which in Windows uses \
-                            var src = path.join('/', target_path).replace(new RegExp('\\' + path.sep, 'g'), '/');
-                            res.send(src);
-                        }
-                    });
+                    return errors.logError(err);
                 }
+
+                fs.copy(tmp_path, target_path, function (err) {
+                    if (err) {
+                        return errors.logError(err);
+                    }
+
+                    fs.unlink(tmp_path, function (e) {
+                        if (err) {
+                            return errors.logError(err);
+                        }
+
+                        // the src for the image must be in URI format, not a file system path, which in Windows uses \
+                        var src = path.join('/', target_path).replace(new RegExp('\\' + path.sep, 'g'), '/');
+                        return res.send(src);
+                    });
+                });
             });
         }
 
diff --git a/core/test/unit/admin_spec.js b/core/test/unit/admin_spec.js
index e0de048fdb..40c9614409 100644
--- a/core/test/unit/admin_spec.js
+++ b/core/test/unit/admin_spec.js
@@ -47,12 +47,14 @@ describe('Admin Controller', function() {
                 req.files.uploadimage.name = "IMAGE.jpg";
                 sinon.stub(fs, 'mkdirs').yields();
                 sinon.stub(fs, 'copy').yields();
+                sinon.stub(fs, 'unlink').yields();
                 sinon.stub(fs, 'exists').yields(false);
             });
 
             afterEach(function() {
                 fs.mkdirs.restore();
                 fs.copy.restore();
+                fs.unlink.restore();
                 fs.exists.restore();
                 clock.restore();
             });
@@ -141,6 +143,17 @@ describe('Admin Controller', function() {
 
                 return admin.uploader(req, res);
             });
+
+            it('should not leave temporary file when uploading', function(done) {
+                clock = sinon.useFakeTimers(new Date(2013, 8, 8, 10, 57).getTime());
+                sinon.stub(res, 'send', function(data) {
+                    fs.unlink.calledOnce.should.be.true;
+                    fs.unlink.args[0][0].should.equal('/tmp/TMPFILEID');
+                    return done();
+                });
+
+                admin.uploader(req, res);
+            });
         });
     });
 });