diff --git a/src/userLog.js b/src/userLog.js
index 2d4e4ba1..1e10f4d4 100644
--- a/src/userLog.js
+++ b/src/userLog.js
@@ -16,19 +16,26 @@ module.exports.write = function(user, network, chan, msg) {
 	var tz = Helper.config.logs.timezone || "UTC+00:00";
 
 	var time = moment().utcOffset(tz).format(format);
-	var line = "[" + time + "] ";
+	var line = `[${time}] `;
 
 	var type = msg.type.trim();
 	if (type === "message" || type === "highlight") {
 		// Format:
 		// [2014-01-01 00:00:00] <Arnold> Put that cookie down.. Now!!
-		line += "<" + msg.from + "> " + msg.text;
+		line += `<${msg.from}> ${msg.text}`;
 	} else {
 		// Format:
 		// [2014-01-01 00:00:00] * Arnold quit
-		line += "* " + msg.from + " " + msg.type;
+		line += `* ${msg.from} `;
+
+		if (msg.hostmask) {
+			line += `(${msg.hostmask}) `;
+		}
+
+		line += msg.type;
+
 		if (msg.text) {
-			line += " " + msg.text;
+			line += ` ${msg.text}`;
 		}
 	}