Merge branch 'sans_branch' into develop

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
index b7155643..4a4d3413 100644
--- a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
+++ b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
@@ -151,8 +151,8 @@ public class S2SComponent implements JuickComponent {
 
     public S2SComponent(JuickApplication application, Properties conf) {
         LOGGER.info("component initialized");
-        HOSTNAME = conf.getProperty("hostname");
-        componentName = conf.getProperty("componentname");
+        HOSTNAME = conf.getProperty("hostname", "juick.com");
+        componentName = conf.getProperty("componentname", "s2s");
         STATSFILE = conf.getProperty("statsfile");
         this.sql = application.getSql();
         this.executorService = application.getExecutorService();