diff --git a/pkg/messaging/mqtt/pubsub.go b/pkg/messaging/mqtt/pubsub.go
index 51dcc838..297749d5 100644
--- a/pkg/messaging/mqtt/pubsub.go
+++ b/pkg/messaging/mqtt/pubsub.go
@@ -12,19 +12,16 @@ import (
 
 const (
 	protocol = "mqtt"
-	id       = "mqtt-publisher"
-	qos      = 1
+	username = "mainflux-mqtt"
+	qos      = 2
 )
 
 var errConnect = errors.New("failed to connect to MQTT broker")
 
 func newClient(address string, timeout time.Duration) (mqtt.Client, error) {
 	opts := mqtt.NewClientOptions().
-		AddBroker(address).
-		SetUsername(id).
-		SetPassword(id).
-		SetClientID(id).
-		SetCleanSession(false)
+		SetUsername(username).
+		AddBroker(address)
 	client := mqtt.NewClient(opts)
 	token := client.Connect()
 	if token.Error() != nil {