diff --git a/src/mqtt.py b/src/mqtt.py
index 30ba3d8..3139c9e 100644
--- a/src/mqtt.py
+++ b/src/mqtt.py
@@ -25,7 +25,7 @@
 
 def connect():
     client = mqtt.Client("volvoAAOS2mqtt") if os.environ.get("IS_HA_ADDON") \
-        else mqtt.Client("volvoAAOS2mqtt_" + settings.volvoData["username"])
+        else mqtt.Client("volvoAAOS2mqtt_" + settings.volvoData["username"].replace("+", ""))
 
     client.will_set(availability_topic, "offline", 0, False)
     if settings["mqtt"]["username"] and settings["mqtt"]["password"]: