diff --git a/manifests/firewall.pp b/manifests/firewall.pp
index 1ca29b66f580e38f2782b8e0c8df960bbad13b3e..31b5ffd562604e55a7af3ef30192edbd91fd4811 100644
--- a/manifests/firewall.pp
+++ b/manifests/firewall.pp
@@ -3,7 +3,7 @@ class puppet_cwsens::firewall{
 
   $mqtt_rule = @("EOT"/L)
     require services
-    service mqtt { tcp/1883 }
+    service mqtt is { tcp/1883 }
     policy ipsum-mqtt chain ipsum-mqtt is
       accept service:mqtt from class:liu-nets
     end policy
diff --git a/manifests/init.pp b/manifests/init.pp
index 2a61c757c805b61725788be4613a1f4499e0fcb6..7e5f3054349fcb84871906d299af5b0aa9254005 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,9 +6,11 @@ class puppet_cwsens(
 
   $mosquitto_conf = @("EOT"/L)
     per_listener_settings true
+    listener 1883
+    allow_anonymous false
+    password_file /etc/mosquitto/passwd
     max_inflight_messages 0
     sys_interval 2
-    allow_anonymous false
     | EOT
 
   file { '/etc/mosquitto/mosquitto.conf':