diff --git a/etc/default.nix b/etc/default.nix
index 656e197eca5..cf4085ba236 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -259,6 +259,7 @@ import ../helpers/make-etc.nix {
       "kde"
       "cups"
       "ftp"
+      "ejabberd"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/ejabberd b/etc/pam.d/ejabberd
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/ejabberd
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index d2a5084068f..d7ab158af5d 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -24,7 +24,7 @@ in
             fi
 	    
 	    mkdir -p ${cfg.confDir}
-	    sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+	    test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
       end script
       
       respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'