diff --git a/client/Gallery3.php b/client/Gallery3.php
index 50e790ab..991e85de 100644
--- a/client/Gallery3.php
+++ b/client/Gallery3.php
@@ -49,7 +49,7 @@ class Gallery3 {
    * @param   string authentication token
    * @return  object Gallery3
    */
-  public function factory($url=null, $token=null) {
+  static function factory($url=null, $token=null) {
     $obj = new Gallery3();
     $obj->token = $token;
     $obj->url = $url;
diff --git a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
index 70c9e817..9bde44b9 100644
--- a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
+++ b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
@@ -178,13 +178,16 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver {
   public function groups() {
     $groups = array();
     foreach (self::$_params["groups"] as $group_name) {
-      $root = item::root();
       $groups[] = $this->lookup_group_by_name($group_name);
     }
     return $groups;
   }
 
   static function groups_for($user) {
+    if ($user->guest) {
+      return $user->groups;
+    }
+
     $result = ldap_search(self::$_connection, self::$_params["group_domain"],
                           "(memberUid=$user->name)");
 
diff --git a/modules/register/controllers/register.php b/modules/register/controllers/register.php
index 7b8d957a..07102b89 100755
--- a/modules/register/controllers/register.php
+++ b/modules/register/controllers/register.php
@@ -61,7 +61,7 @@ class register_Controller extends Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $form->__toString()));
+              "form" => (string) $form));
     }
   }
 
diff --git a/modules/register/helpers/register.php b/modules/register/helpers/register.php
index 65c145eb..ea196087 100644
--- a/modules/register/helpers/register.php
+++ b/modules/register/helpers/register.php
@@ -78,20 +78,14 @@ class register_Core {
   static function create_new_user($id) {
     $user = ORM::factory("pending_user", $id);
 
-    $password = md5(rand());
-    $new_user = identity::create_user($user->name, $user->full_name, $password);
-    $new_user->email = $user->email;
+    $password = md5(uniqid(mt_rand(), true));
+    $new_user = identity::create_user($user->name, $user->full_name, $password, $user->email);
     $new_user->url = $user->url;
     $new_user->admin = false;
     $new_user->guest = false;
     $new_user->save();
 
-    $default_group = module::get_var("registration", "default_group");
-    if (!empty($default_group)) {
-      identity::add_user_to_group($new_user, $default_group);
-    }
-
-    $user->hash =  md5(rand());
+    $user->hash =  md5(uniqid(mt_rand(), true));
     $user->state = 2;
     $user->save();
     self::send_user_created_confirmation($user, $password);