diff --git a/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/GUI.java b/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/GUI.java
index 337503c..d94c573 100644
--- a/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/GUI.java
+++ b/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/GUI.java
@@ -125,6 +125,7 @@ public class GUI
 		if(mainTextField.isEditable())
 			mainTextField.setEditable(false);
 		
+		mainTextField.setLineWrap(true);
 		mainTextField.setText(Miscellaneous.arrayImplode(Miscellaneous.lineSeparator, textEntriesList));
 
 		JScrollBar vertical = mainTextFieldHolder.getVerticalScrollBar();
diff --git a/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/MQTT.java b/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/MQTT.java
index a4f06c7..0122ea3 100644
--- a/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/MQTT.java
+++ b/RhasspyVisualConversationTool/src/com/jens/rhasspy/visualtool/MQTT.java
@@ -17,7 +17,7 @@ import com.jens.rhasspy.visualtool.lib.JSONObject;
 
 public class MQTT implements MqttCallbackExtended
 {	
-	final static String clientId = "RhasspyVisualConversationTool-" + Settings.siteId + "-" + String.valueOf(Calendar.getInstance().getTimeInMillis());
+	final static String clientId = "RhasspyVisualConversationTool-" + Settings.siteId;
 	final static int maximumReconnectionAttempts = -1;			
 	final static boolean forceReconnection = false;