diff --git a/app.js b/app.js
index d66e81f137..00675e0a30 100644
--- a/app.js
+++ b/app.js
@@ -39,7 +39,7 @@ winston.add(winston.transports.Console, {
 });
 
 winston.add(winston.transports.File, {
-	filename: 'error.log',
+	filename: 'logs/error.log',
 	level: 'error'
 });
 
diff --git a/src/events.js b/src/events.js
index 3890b707e7..05d6e2cee5 100644
--- a/src/events.js
+++ b/src/events.js
@@ -9,7 +9,7 @@ var fs = require('fs'),
 
 
 (function(events) {
-	var logFileName = 'events.log';
+	var logFileName = 'logs/events.log';
 
 	events.logPasswordChange = function(uid) {
 		logWithUser(uid, 'changed password');
@@ -105,12 +105,11 @@ var fs = require('fs'),
 	events.getLog = function(callback) {
 		var logFile = path.join(nconf.get('base_dir'), logFileName);
 
-		fs.exists(logFile, function(exists) {
-			if (exists) {
-				fs.readFile(logFile, callback);
-			} else {
-				callback(null, 'No logs found');
+		fs.readFile(logFile, function(err, res) {
+			if(err) {
+				return callback(null, 'No logs found!');
 			}
+			callback(null, res);
 		});
 	};