diff --git a/ejabberd/templates/ejabberd.cfg.erb b/ejabberd/templates/ejabberd.cfg.erb
index 9da7971..5fb62d2 100644
--- a/ejabberd/templates/ejabberd.cfg.erb
+++ b/ejabberd/templates/ejabberd.cfg.erb
@@ -38,17 +38,17 @@
 %%
 %% Override global options (shared by all ejabberd nodes in a cluster).
 %%
-%%override_global.
+override_global.
 
 %%
 %% Override local options (specific for this particular ejabberd node).
 %%
-%%override_local.
+override_local.
 
 %%
 %% Remove the Access Control Lists before new ones are added.
 %%
-%%override_acls.
+override_acls.
 
 
 %%%   =========
@@ -63,13 +63,14 @@
 %% 4: Info
 %% 5: Debug
 %%
-{loglevel, 4}.
+{loglevel, 2}.
 
 %%
 %% watchdog_admins: If an ejabberd process consumes too much memory,
 %% send live notifications to those Jabber accounts.
 %%
 %%{watchdog_admins, ["bob@example.com"]}.
+{watchdog_admins, []}.
 
 
 %%%   ================
@@ -109,12 +110,12 @@
   %%
   %% To enable the old SSL connection method (deprecated) in port 5223:
   %%
-  %%{5223, ejabberd_c2s, [
-  %%			{access, c2s},
-  %%			%%{shaper, c2s_shaper},
-  %%			{max_stanza_size, 65536},
-  %%			tls, {certfile, "/etc/ejabberd/ejabberd.pem"}
-  %%		       ]},
+  {5223, ejabberd_c2s, [
+  			{access, c2s},
+  			%%{shaper, c2s_shaper},
+  			{max_stanza_size, 65536},
+  			tls, {certfile, "/etc/ejabberd/ejabberd.pem"}
+  		       ]},
 
   {5269, ejabberd_s2s_in, [
 			   {shaper, s2s_shaper},
@@ -439,11 +440,13 @@
 	       {allow, all}]}.
 
 %% For all users except admins used "normal" shaper
-{access, c2s_shaper, [{none, admin},
-		      {normal, all}]}.
+%%{access, c2s_shaper, [{none, admin},
+%%		      {normal, all}]}.
+{access, c2s_shaper, [{none, all}]}.
 
 %% For all S2S connections used "fast" shaper
-{access, s2s_shaper, [{fast, all}]}.
+%%{access, s2s_shaper, [{fast, all}]}.
+{access, s2s_shaper, [{none, all}]}.
 
 %% Only admins can send announcement messages:
 {access, announce, [{allow, admin}]}.