Fix user activation

diff --git a/snf-astakos-app/astakos/im/activation_backends.py b/snf-astakos-app/astakos/im/activation_backends.py
index 1ef0fb8..584928f 100644 (file)
--- a/snf-astakos-app/astakos/im/activation_backends.py
+++ b/snf-astakos-app/astakos/im/activation_backends.py
@@ -132,7 +132,7 @@ class ActivationBackend(object):
             else:
                 send_account_creation_notification(
                     template_name=admin_email_template_name,
-                    dictionary={'user': user, 'group_creation': True}
+                    dictionary={'user': user.__dict__, 'group_creation': True}
                 )
                 return NotificationSent()
         except BaseException, e:

diff --git a/snf-astakos-app/astakos/im/models.py b/snf-astakos-app/astakos/im/models.py
index efb96fa..deeb29c 100644 (file)
--- a/snf-astakos-app/astakos/im/models.py
+++ b/snf-astakos-app/astakos/im/models.py
@@ -358,7 +358,7 @@ class AstakosUser(User):
     def __init__(self, *args, **kwargs):
         super(AstakosUser, self).__init__(*args, **kwargs)
         self.__has_signed_terms = self.has_signed_terms
-        if not self.id and not self.is_active:
+        if not self.id:
             self.is_active = False
 
     @property