diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 3ca5cce34..7e966fa46 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -488,7 +488,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
 
   didBind = NO;
 
-  if ([_login length] > 0)
+  if ([_login length] > 0 && [_pwd length] > 0)
     {
       bindConnection = [[NGLdapConnection alloc] initWithHostName: hostname
 						 port: port];
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 19f372307..afc9d553a 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -21,7 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __OpenBSD__ 
 #include <crypt.h>
+#endif
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCharacterSet.h>
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index e335ed67f..f69ab0622 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -61,7 +61,7 @@ function onLoginClick(event) {
     var password = $("password").value;
     var language = $("language");
 
-    if (userName.length > 0) {
+    if (userName.length > 0 && password.length > 0) {
         this.disabled = true;
         startAnimation($("animation"));