Index: /trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- /trunk/packages/sipb-xen-www/code/main.py	(revision 575)
+++ /trunk/packages/sipb-xen-www/code/main.py	(revision 576)
@@ -161,5 +161,5 @@
         err = None
     state.clear() #Changed global state
-    d = getListDict(username)
+    d = getListDict(username, state)
     d['err'] = err
     if err:
@@ -336,5 +336,5 @@
     if back == 'list':
         state.clear() #Changed global state
-        d = getListDict(username)
+        d = getListDict(username, state)
         d['result'] = result
         return templates.list(searchList=[d])
Index: /trunk/packages/sipb-xen-www/code/validation.py
===================================================================
--- /trunk/packages/sipb-xen-www/code/validation.py	(revision 575)
+++ /trunk/packages/sipb-xen-www/code/validation.py	(revision 576)
@@ -242,5 +242,5 @@
 
 def testContact(user, contact, machine=None):
-    if contact in (None, machine.contact):
+    if contact is None or (machine is not None and contact == machine.contact):
         return None
     if not re.match("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", contact, re.I):