diff --git a/backend/gvadm/DomainTools.py b/backend/gvadm/DomainTools.py
index ceeba7c..e73cde9 100644
--- a/backend/gvadm/DomainTools.py
+++ b/backend/gvadm/DomainTools.py
@@ -83,9 +83,12 @@ class Domain:
 
     result = cr.fetchall()
     if (not result):
-      return sysuser + "p01"
+      return sysuser + "p1"
 
     maxpopuser = result[0][0]
+    if (not maxpopuser):
+      return sysuser + "p1"
+
     num = int(maxpopuser[len(sysuser)+1:])+1
     return "%sp%d" % (sysuser, num)
 
@@ -161,10 +164,12 @@ Password: %(password)s""" % {'domain': self.domain,
       raise InvalidPopUser(self, username)
  
 if __name__ == '__main__':
-  domain = Domain('efs-sohland.de')
+  domain = Domain('centrum-warenhaus-dresden.de')
+  # list pop users
+  print ", ".join(domain.listPopUsers())
   # check for not existing user
-  try:
-    domain.updatePopPassword('usr03p2', 'test')
-  except InvalidPopUser, ipu:
-    print ipu
-  domain.updatePopPassword('usr05p2')
+  #try:
+  #  domain.updatePopPassword('usr03p2', 'test')
+  #except InvalidPopUser, ipu:
+  #  print ipu
+  #domain.updatePopPassword('usr05p2')