diff --git a/deps/rabbit/docs/rabbitmq.conf.example b/deps/rabbit/docs/rabbitmq.conf.example
index da8cbe36a6..2a3f3f590d 100644
--- a/deps/rabbit/docs/rabbitmq.conf.example
+++ b/deps/rabbit/docs/rabbitmq.conf.example
@@ -232,6 +232,7 @@
 ##
 # auth_mechanisms.1 = PLAIN
 # auth_mechanisms.2 = AMQPLAIN
+# auth_mechanisms.3 = ANONYMOUS
 
 ## The rabbitmq-auth-mechanism-ssl plugin makes it possible to
 ## authenticate a user based on the client's x509 (TLS) certificate.
@@ -905,14 +906,8 @@
 ##
 # mqtt.proxy_protocol = false
 
-## Set the default user name and password used for anonymous connections (when client
-## provides no credentials). Anonymous connections are highly discouraged!
-##
-# mqtt.default_user = guest
-# mqtt.default_pass = guest
-
 ## Enable anonymous connections. If this is set to false, clients MUST provide
-## credentials in order to connect. See also the mqtt.default_user/mqtt.default_pass
+## credentials in order to connect. See also the anonymous_login_user/anonymous_login_pass
 ## keys. Anonymous connections are highly discouraged!
 ##
 # mqtt.allow_anonymous = true
diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
index 2331699751..324d0f30fe 100644
--- a/deps/rabbit/priv/schema/rabbit.schema
+++ b/deps/rabbit/priv/schema/rabbit.schema
@@ -738,15 +738,7 @@ end}.
 %% Setting this to a username will allow (anonymous) clients to connect and act as this
 %% given user. For production environments, set this value to 'none'.
 {mapping, "anonymous_login_user", "rabbit.anonymous_login_user",
-    [{datatype, [{enum, [none]}, string]}]}.
-
-{translation, "rabbit.anonymous_login_user",
-fun(Conf) ->
-        case cuttlefish:conf_get("anonymous_login_user", Conf) of
-            none -> none;
-            User -> list_to_binary(User)
-        end
-end}.
+    [{datatype, [{enum, [none]}, binary]}]}.
 
 {mapping, "anonymous_login_pass", "rabbit.anonymous_login_pass", [
     {datatype, [tagged_binary, binary]}