summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/forms_common.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index cb75e4026..2859ed4e5 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -459,8 +459,10 @@ class AccountForm(forms.Form):
try:
person = models.Person.objects.get(pk=kwargs['initial']['pk'])
account = models.IshtarUser.objects.get(person=person)
- kwargs['initial'].update({'username': account.username,
- 'email': account.email})
+ if not kwargs['initial'].get('username'):
+ kwargs['initial']['username'] = account.username
+ if not kwargs['initial'].get('email'):
+ kwargs['initial']['email'] = account.email
except ObjectDoesNotExist:
pass
return super(AccountForm, self).__init__(*args, **kwargs)