Index: /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1214)
+++ /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1215)
@@ -37,9 +37,16 @@
         students = context.portal_url.getPortalObject().campus.students
         student = getattr(students,str(member))
-        if request.has_key('email'):
+        if request.has_key('returning'):
+            email=request.get("email")
+            phone=request.get("phone_nr")
             context.waeup_tool.makeStudentData(str(member),
-                                               email=request.get("email"),
-                                               phone_nr=request.get("phone_nr"),
+                                               email=email,
+                                               phone_nr=phone,
                                                )
+            d = {}
+            d['id'] = str(member)
+            d['email'] = email
+            d['phone'] = phone
+            context.students_catalog.modifyRecord(**d)
         student_app = getattr(student,'application',None)
         if student_app is None:
Index: /WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py	(revision 1214)
+++ /WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py	(revision 1215)
@@ -51,5 +51,6 @@
         psm = ''
     except KeyError:
-        psm = "You are already registered please log in with your UserId %s" % sid
+        #psm = "You are already registered please log in with your UserId %s" % sid
+        psm = ""
         logger.info('"%s","repeatedly tried to set password"' % sid)
 if psm != '':
