Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/authentication.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/authentication.py	(revision 6464)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/authentication.py	(revision 6465)
@@ -68,5 +68,5 @@
         if prefix is not None:
             self.id = '%s.%s' % (prefix, self.id)
-        self.title = u'My Application'
+        self.title = u'Applicant'
         self.description = u'An applicant'
         self.groups = []
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6464)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6465)
@@ -546,4 +546,6 @@
     @property
     def title(self):
+        if self.request.principal.title == 'Applicant':
+            return u'Your Application Record'
         return '%s' % self.context.access_code
 
@@ -749,4 +751,5 @@
     grok.template('form_edit')
     manage_applications = False
+    title = u'Your Application Form'
 
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6464)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6465)
@@ -142,4 +142,6 @@
         if usertitle == 'Unauthenticated User':
             return u'Anonymous User'
+        elif usertitle == 'Applicant':
+            return self.request.principal.id
         return usertitle
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6464)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6465)
@@ -375,4 +375,11 @@
         return tt
 
+    @property
+    def namefield_label(self):
+        if self.request.principal.title == 'Applicant':
+            return 'Access Code'
+        else:
+            return 'Full Name'
+
     def update(self, *args, **kw):
         form = self.request.form
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactadminform.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactadminform.pt	(revision 6464)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactadminform.pt	(revision 6465)
@@ -5,8 +5,8 @@
 <tr>
   <td width="150px">
-     <strong>Full Name: </strong>
+     <strong><span tal:replace="view/namefield_label" />: </strong>
   </td>
   <td tal:condition="not:layout/isAuthenticated">
-     <input name="fullname" type="text" id="fullname" tal:attributes="value view/fullname|nothing" />
+     <input name="fullname" type="text" id="fullname"/>
   </td>
   <td tal:condition="layout/isAuthenticated"> 
@@ -29,6 +29,5 @@
   </td>
   <td>
-     <textarea name="descr" rows="10" cols="60" id="descr"><span tal:replace="view/descr|nothing" /></textarea>
-     
+     <textarea name="descr" rows="10" cols="60" id="descr"></textarea>
   </td>
 </tr>
