diff --git a/radioconfig.options b/radioconfig.options
index 289b157..1a95b78 100644
--- a/radioconfig.options
+++ b/radioconfig.options
@@ -5,4 +5,7 @@
 # Max of three ignored nodes for our testing
 *UserPreferences.ignore_incoming max_count:3
 
-*UserPreferences.mqtt_server max_size:32
\ No newline at end of file
+*UserPreferences.mqtt_server max_size:32
+*UserPreferences.mqtt_username max_size:32
+*UserPreferences.mqtt_password max_size:32
+
diff --git a/radioconfig.proto b/radioconfig.proto
index c397d8b..dce1120 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -581,6 +581,21 @@ message RadioConfig {
      * 
      */
     uint32 hop_limit = 154;
+
+    /*
+     * MQTT username to use (most useful for a custom MQTT server).
+     * If using a custom server, this will be honoured even if empty.
+     * If using the default server, this will only be honoured if set, otherwise the device will use the default username
+     */
+    string mqtt_username = 155;
+    
+    /*
+     * MQTT password to use (most useful for a custom MQTT server).
+     * If using a custom server, this will be honoured even if empty.
+     * If using the default server, this will only be honoured if set, otherwise the device will use the default password
+     */
+    string mqtt_password = 156;
+
   }
 
   UserPreferences preferences = 1;