diff --git a/src/routes/user.js b/src/routes/user.js
index 856266fbdb..be7deb457e 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -152,7 +152,7 @@ var user = require('./../user.js'),
 			}
 
 			var filename = uid + '-profileimg' + extension;
-			var uploadPath = path.join(__dirname, '../', global.nconf.get('upload_path'), filename);
+			var uploadPath = path.join(process.cwd(), global.nconf.get('upload_path'), filename);
 
 			winston.info('Attempting upload to: '+ uploadPath);
 
@@ -179,10 +179,10 @@ var user = require('./../user.js'),
 
 					res.json({ path: imageUrl });
 				});
-
 			});
 
 			os.on('error', function(err) {
+				fs.unlinkSync(tempPath);
 				winston.error('[%d] %s', Date.now(), + err);
 			});
 
diff --git a/src/webserver.js b/src/webserver.js
index 5c23978493..c04b59fb20 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -62,6 +62,7 @@ var express = require('express'),
 	app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public'), prefix:nconf.get('relative_path') }));
 	app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser());	// Puts POST vars in request.body
+
 	app.use(express.cookieParser());	// If you want to parse cookies (res.cookies)
 	app.use(express.compress());
 	app.use(express.session({