diff -r 64146196b142 -r edc63dc72566 plugins/mod_tls.lua
--- a/plugins/mod_tls.lua	Tue Oct 21 12:47:53 2014 +0200
+++ b/plugins/mod_tls.lua	Tue Oct 21 12:49:03 2014 +0200
@@ -9,7 +9,7 @@
 local create_context = require "core.certmanager".create_context;
 local st = require "util.stanza";
 
-local c2s_require_encryption = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
+local c2s_require_encryption = module:get_option("c2s_require_encryption", module:get_option("require_encryption"));
 local s2s_require_encryption = module:get_option("s2s_require_encryption");
 local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false;
 local s2s_secure_auth = module:get_option("s2s_secure_auth");