Index: /WAeUP_SRP/base/skins/waeup_student/clearance_edit.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_student/clearance_edit.py	(revision 2671)
+++ /WAeUP_SRP/base/skins/waeup_student/clearance_edit.py	(revision 2672)
@@ -76,13 +76,12 @@
     clear_doc.edit(mapping = {'cleared_date': current,})
     wftool.doActionFor(info['student'],'clear_and_validate')
-    
-    if info['per_review_state'] != 'opened':
-        wftool.doActionFor(info['per'],'open')
-    
-    per_doc = info['per'].getContent()
-    per_doc.edit(mapping = {'firstname': clear_doc.firstname, 'middlename': clear_doc.middlename, 'lastname': clear_doc.lastname,})
-    
-    
-    
+
+
+    if clear_doc.firstname and clear_doc.lastname:
+        if info['per_review_state'] != 'opened':
+            wftool.doActionFor(info['per'],'open')
+        per_doc = info['per'].getContent()
+        per_doc.edit(mapping = {'firstname': clear_doc.firstname, 'middlename': clear_doc.middlename, 'lastname': clear_doc.lastname,})
+
     psm = "Clearance and eligibility record is validated and student is cleared!"
 elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
@@ -117,5 +116,5 @@
             if not clear_doc.firstname or not clear_doc.lastname:
                 logger.info('%s requested clearance without confirming name' % (student_id))
-                psm = "Please fill the name fields! First and last name are required. "            
+                psm = "Please fill the name fields! First and last name are required. "
             else:
                 logger.info('%s requested clearance' % (student_id))
