diff -ur Coccinella-0.95.8Src/jabber/Login.tcl Coccinella-0.95.8Src-sasl/jabber/Login.tcl
--- Coccinella-0.95.8Src/jabber/Login.tcl	2005-06-20 14:55:27.000000000 +0100
+++ Coccinella-0.95.8Src-sasl/jabber/Login.tcl	2005-07-01 17:34:40.000000000 +0100
@@ -335,7 +335,7 @@
     Kill
     
     # Check 'server', 'username' and 'password' if acceptable.
-    foreach name {server username password} {
+    foreach name {server username} {
 	upvar 0 $name var
 	if {[string length $var] <= 1} {
 	    ::UI::MessageBox -icon error -type ok \
diff -ur Coccinella-0.95.8Src/jabberlib/jlibsasl.tcl Coccinella-0.95.8Src-sasl/jabberlib/jlibsasl.tcl
--- Coccinella-0.95.8Src/jabberlib/jlibsasl.tcl	2005-05-22 11:03:24.000000000 +0100
+++ Coccinella-0.95.8Src-sasl/jabberlib/jlibsasl.tcl	2005-07-01 17:59:09.000000000 +0100
@@ -11,9 +11,9 @@
 # We need to be flexible here since can have cyrus based sasl or our 
 # own special pure tcl saslmd5.
 
-if {0 && ![catch {package require sasl 1.0}]} {
+if {![catch {package require sasl 1.0}]} {
     set ::_saslpack cyrussasl
-} elseif {0 && ![catch {package require saslclient 1.1}]} {
+} elseif {![catch {package require saslclient 1.1}]} {
     set ::_saslpack cyrussasl
 } elseif {![catch {package require saslmd5}]} {
     set ::_saslpack saslmd5