Index: /WAeUP_SRP/base/Widgets.py
===================================================================
--- /WAeUP_SRP/base/Widgets.py	(revision 2602)
+++ /WAeUP_SRP/base/Widgets.py	(revision 2603)
@@ -1215,10 +1215,10 @@
                 datastructure.setError(widget_id, 'PIN neither checked nor used.')
                 s_logger.info('%s/%s entered wrong data together with PIN %s' % (s_id,ref,pin_str))
-        if prefix == 'APP' and not self.reuse_pin:
-            res =  self.applicants_catalog(reg_no = ref)
-            if res and res[0].pin == pin_str:
-                do = 0
-                err = 'Application PINs cannot be reused!'
-                s_logger.info('%s entered same PIN as for screening application %s' % (s_id,pin_str))
+            elif prefix == 'APP' and not self.reuse_pin:
+                res =  self.applicants_catalog(reg_no = ref)
+                if res and res[0].pin == pin_str:
+                    do = 0
+                    err = 'Application PINs cannot be reused!'
+                    s_logger.info('%s entered same PIN as for screening application %s' % (s_id,pin_str))
 
         while do:
