diff --git a/client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.java b/client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.java
index 7843909aa5..2e7974dc5f 100644
--- a/client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.java
+++ b/client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.java
@@ -643,6 +643,10 @@ private void loadTemplateButtonActionPerformed(java.awt.event.ActionEvent evt) {
                 connectionFactoryNameField.setText(template.getJndiConnectionFactoryName());
                 connectionFactoryClassField.setText(template.getConnectionFactoryClass());
                 connectionPropertiesTable.setProperties(template.getConnectionProperties());
+                usernameField.setText(template.getUsername());
+                passwordField.setText(template.getPassword());
+                clientIdField.setText(template.getClientId());
+                destinationNameField.setText(template.getDestinationName());
             }
         }
     }//GEN-LAST:event_loadTemplateButtonActionPerformed
diff --git a/client/src/com/mirth/connect/connectors/jms/JmsTemplateListModel.java b/client/src/com/mirth/connect/connectors/jms/JmsTemplateListModel.java
index f499db231e..dc7caf9668 100644
--- a/client/src/com/mirth/connect/connectors/jms/JmsTemplateListModel.java
+++ b/client/src/com/mirth/connect/connectors/jms/JmsTemplateListModel.java
@@ -53,6 +53,17 @@ private JmsTemplateListModel() {
         properties.setJndiConnectionFactoryName("java:/ConnectionFactory");
         templates.put("JBoss Messaging / MQ", properties);
 
+        properties = new JmsConnectorProperties();
+        properties.setUseJndi(false);        
+        properties.setConnectionFactoryClass("com.rabbitmq.jms.admin.RMQConnectionFactory");
+        properties.getConnectionProperties().put("brokerURL", "failover:(tcp://localhost:5672)?maxReconnectAttempts=0");
+        properties.getConnectionProperties().put("closeTimeout", "15000");
+        properties.getConnectionProperties().put("useCompression", "no");
+        properties.setUsername("guest");
+        properties.setPassword("guest");
+        properties.setDestinationName("myqueue");
+        templates.put("RabbitMQ", properties);
+
         templateNames.addAll(templates.keySet());
         readOnlyTemplateNames.addAll(templates.keySet());
     }