merged with the master branch

1 files changed, 8 insertions, 7 deletions

diff --git a/askbot/forms.py b/askbot/forms.py
index 55d864c3..5168e354 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -629,12 +629,13 @@ class ChangeUserStatusForm(forms.Form):
         super(ChangeUserStatusForm, self).__init__(*arg, **kwarg)
 
         #select user_status_choices depending on status of the moderator
-        if moderator.is_administrator():
-            user_status_choices = ADMINISTRATOR_STATUS_CHOICES
-        elif moderator.is_moderator():
-            user_status_choices = MODERATOR_STATUS_CHOICES
-            if subject.is_moderator() and subject != moderator:
-                raise ValueError('moderator cannot moderate another moderator')
+        if moderator.is_authenticated():
+            if moderator.is_administrator():
+                user_status_choices = ADMINISTRATOR_STATUS_CHOICES
+            elif moderator.is_moderator():
+                user_status_choices = MODERATOR_STATUS_CHOICES
+                if subject.is_moderator() and subject != moderator:
+                    raise ValueError('moderator cannot moderate another moderator')
         else:
             raise ValueError('moderator or admin expected from "moderator"')
 
@@ -1325,7 +1326,7 @@ class EditTagWikiForm(forms.Form):
 class EditUserForm(forms.Form):
     email = forms.EmailField(
                     label=u'Email',
-                    required=True,
+                    required=False,
                     max_length=255,
                     widget=forms.TextInput(attrs={'size': 35})
                 )