diff --git a/logging_setup.py b/logging_setup.py
index 3c0f8536b77e3c670c39e55a49d79999b8f296be..0bdf60bbdb02be19bf2bf5a504e42481c3ce7597 100644
--- a/logging_setup.py
+++ b/logging_setup.py
@@ -1,3 +1,5 @@
+import os
+
 from settings import LOGGING_CONFIG, DATA_LOGGING_CONFIG, MQTT_LOGGING_CONFIG
 from os import path, mkdir, statvfs
 from time import gmtime
@@ -49,7 +51,7 @@ def setup_loggers(mqtt=True):
     if logging_to_console:
         msg_logger.addHandler(logging.StreamHandler())
     if mqtt:
-        mqtt_msg_handler = MQTTHandler(MQTT_LOGGING_CONFIG['hostname'], MQTT_LOGGING_CONFIG['topic'])
+        mqtt_msg_handler = MQTTHandler(MQTT_LOGGING_CONFIG['hostname'], MQTT_LOGGING_CONFIG['msg_topic'])
         mqtt_msg_handler.setLevel(logging_level)
         mqtt_msg_handler.setFormatter(msg_formatter)
         msg_logger.addHandler(mqtt_msg_handler)
@@ -68,7 +70,7 @@ def setup_loggers(mqtt=True):
     return msg_logger, msg_log_filename, data_logger, data_log_filename, logging_level
 
 
-def init_logging(msg_logger, logging_level, data_log_filename):
+def init_logging(msg_logger, logging_level, log_path='.', data_log_filename):
     """ This is the init sequence for the logging system """
 
     init_logging_status = True