diff --git a/ejabberd/templates/ejabberd.cfg.erb b/ejabberd/templates/ejabberd.cfg.erb
index 816c5d4..2573011 100644
--- a/ejabberd/templates/ejabberd.cfg.erb
+++ b/ejabberd/templates/ejabberd.cfg.erb
@@ -1,6 +1,6 @@
 %%%
-%%%     Debian ejabberd configuration file
-%%%     This config must be in UTF-8 encoding
+%%%  ejabberd configuration file
+%%%  This config must be in UTF-8 encoding
 %%%
 %%% The parameters used in this configuration file are explained in more detail
 %%% in the ejabberd Installation and Operation Guide.
@@ -63,7 +63,7 @@ override_acls.
 %% 4: Info
 %% 5: Debug
 %%
-{loglevel, 2}.
+{loglevel, 4}.
 
 %%
 %% watchdog_admins: If an ejabberd process consumes too much memory,
@@ -191,7 +191,7 @@ override_acls.
 %% Allowed values are: true or false.
 %% You must specify a certificate file.
 %%
-{s2s_use_starttls, true}.
+{s2s_use_starttls, required}.
 
 %%
 %% s2s_certfile: Specify a certificate file.
@@ -273,7 +273,7 @@ override_acls.
 %% Authentication using PAM
 %%
 %%{auth_method, pam}.
-%%{pam_service, "pamservicename"}.
+%%{pam_service, "ejabberd"}.
 
 %%
 %% Authentication using LDAP
@@ -437,7 +437,7 @@ user, host = admin.split("@") -%>
 {access, max_user_sessions, [{100, all}]}.
 
 %% Maximum number of offline messages that users can have:
-{access, max_user_offline_messages, [{5000, admin}, {100, all}]}. 
+{access, max_user_offline_messages, [{5000, admin}, {100, all}]}.
 
 %% This rule allows access only for local users:
 {access, local, [{allow, local}]}.
@@ -464,6 +464,9 @@ user, host = admin.split("@") -%>
 %% Admins of this server are also admins of MUC service:
 {access, muc_admin, [{allow, admin}]}.
 
+%% Only accounts of the local ejabberd server can create rooms:
+{access, muc_create, [{allow, local}]}.
+
 %% All users are allowed to use MUC service:
 {access, muc, [{allow, all}]}.
 
@@ -478,8 +481,8 @@ user, host = admin.split("@") -%>
 %% is limited to 1 account every 10 minutes. To disable put: infinity
 %%{registration_timeout, 600}.
 
-%% Everybody can create pubsub nodes
-{access, pubsub_createnode, [{allow, all}]}.
+%% Only accounts on the local ejabberd server can create Pubsub nodes:
+{access, pubsub_createnode, [{allow, local}]}.
 
 %%
 %% Define specific Access rules in a virtual host.
@@ -559,7 +562,7 @@ user, host = admin.split("@") -%>
 		  {access_persistent, muc},
 		  {access_admin, muc_admin},
 		  {max_user_conferences, 10000},
-		  {max_users, 500}
+		  {max_users, 1000}
 		 ]},
   %%{mod_muc_log,[]},
   {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},