Index: /WAeUP_SRP/trunk/Widgets.py
===================================================================
--- /WAeUP_SRP/trunk/Widgets.py	(revision 2000)
+++ /WAeUP_SRP/trunk/Widgets.py	(revision 2001)
@@ -1045,5 +1045,5 @@
         pins = self.portal_pins
         pin = "%(prefix)s%(b)s%(n)s" % vars()
-        pin_str = "%(prefix)s-%(b)-s%(n)s" % vars()
+        pin_str = "%(prefix)s-%(b)s-%(n)s" % vars()
         do = 1
         s_id = str(self.portal_membership.getAuthenticatedMember())
@@ -1161,9 +1161,10 @@
         v = datamodel[self.fields[0]]
         if v and type(v) is StringType:
+            return self.fields[0]
             try:
                 p,b,n = v.split('-')
                 v = ScratchCardPin(p,b,n)
             except ValueError:
-                v = ScratchCardPin(self.prefix,'1',v)
+                v = ScratchCardPin(self.prefix,'X',v)
                 pass
         if v:
