diff --git a/helios/models.py b/helios/models.py
index bb533db9de4979791888b1064f31ef9a85596047..d0625ad6936b56285f498facf1a12f1e8784df40 100644
--- a/helios/models.py
+++ b/helios/models.py
@@ -299,7 +299,7 @@ class Election(models.Model, electionalgs.Election):
     voter_types = [r['voter_type'] for r in self.voter_set.values('voter_type').distinct()]
 
     if self.openreg:
-      if not 'password' in voter_types:
+      if not 'password' in voter_types and 'password' in auth_systems:
         auth_systems.remove('password')
     else:
       auth_systems = [vt for vt in voter_types if vt in auth_systems]