diff --git a/MyConfig.h b/MyConfig.h
index 9cfb2f7a4..df83bb006 100644
--- a/MyConfig.h
+++ b/MyConfig.h
@@ -1382,6 +1382,26 @@
  */
 //#define MY_MQTT_CLIENT_PUBLISH_RETAIN
 
+/**
+ * @def MY_MQTT_PASSWORD
+ * @brief Used for authenticated MQTT connections.
+ *
+ * Set if your MQTT broker requires username/password.
+ * Example: @code #define MY_MQTT_PASSWORD "secretpassword" @endcode
+ * @see MY_MQTT_USER
+ */
+//#define MY_MQTT_PASSWORD "secretpassword"
+
+/**
+ * @def MY_MQTT_USER
+ * @brief Used for authenticated MQTT connections.
+ *
+ * Set if your MQTT broker requires username/password.
+ * Example: @code #define MY_MQTT_USER "username" @endcode
+ * @see MY_MQTT_PASSWORD
+ */
+//#define MY_MQTT_USER "username"
+
 /**
  * @def MY_IP_ADDRESS
  * @brief Static ip address of gateway (if this is not defined, DHCP will be used).
@@ -2053,6 +2073,8 @@
 #define MY_REPEATER_FEATURE
 #define MY_PASSIVE_NODE
 #define MY_MQTT_CLIENT_PUBLISH_RETAIN
+#define MY_MQTT_PASSWORD
+#define MY_MQTT_USER
 #define MY_SIGNAL_REPORT_ENABLED
 // general
 #define MY_WITH_LEDS_BLINKING_INVERSE
diff --git a/keywords.txt b/keywords.txt
index 917d3f54f..5c72eec26 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -237,8 +237,10 @@ MY_GATEWAY_W5100	LITERAL1
 MY_INCLUSION_BUTTON_EXTERNAL_PULLUP	LITERAL1
 MY_MQTT_CLIENT_ID	LITERAL1
 MY_MQTT_CLIENT_PUBLISH_RETAIN	LITERAL1
+MY_MQTT_PASSWORD	LITERAL1
 MY_MQTT_PUBLISH_TOPIC_PREFIX	LITERAL1
 MY_MQTT_SUBSCRIBE_TOPIC_PREFIX	LITERAL1
+MY_MQTT_USER	LITERAL1
 MY_W5100_SPI_EN	LITERAL1
 
 # Ethernet