Index: /WAeUP_SRP/trunk/Widgets.py
===================================================================
--- /WAeUP_SRP/trunk/Widgets.py	(revision 2001)
+++ /WAeUP_SRP/trunk/Widgets.py	(revision 2002)
@@ -1161,10 +1161,9 @@
         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,'X',v)
+                v = ScratchCardPin(self.prefix,'XXX',v)
                 pass
         if v:
Index: /WAeUP_SRP/trunk/skins/waeup_student/check_admission.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/check_admission.py	(revision 2001)
+++ /WAeUP_SRP/trunk/skins/waeup_student/check_admission.py	(revision 2002)
@@ -65,5 +65,5 @@
                                  ds = ds,
                                  )
-##  
+##
 ##    email = ds.get('app_email')
     student = getattr(context.campus.students, s_id)
@@ -72,10 +72,10 @@
         url = "%s/campus/students/%s/pume/admission_rejected_view" % (context.portal_url(),s_id)
         return redirect(url)
-    pin = str(ds.get('app_ac_pin_n'))
+    pw = str(ds.get('app_ac_pin_n'))
     args = {}
     args['__ac_name'] = s_id
     #args['__ac_password'] = pin.split('-')[2]
-    args['__ac_password'] = pin
-    args['pin'] = pin
+    args['__ac_password'] = pw
+    args['pin'] = str(ds.get('app_ac_pin_p')) + '-' + str(ds.get('app_ac_pin_b')) + '-' + str(ds.get('app_ac_pin_n'))
 ##    args['email'] = email
     url = "%s/logged_in?%s" % (context.absolute_url(),urlencode(args))
