Index: /WAeUP_SRP/base/skins/waeup_default/external_edit_buttons.pt
===================================================================
--- /WAeUP_SRP/base/skins/waeup_default/external_edit_buttons.pt	(revision 3356)
+++ /WAeUP_SRP/base/skins/waeup_default/external_edit_buttons.pt	(revision 3357)
@@ -1,9 +1,9 @@
 <metal:block define-macro="buttons">
   <input type="submit" name="external_edit_button"
-         class="standalone" value="button_change"
+         class="standalone" value="Save"
          id="external_edit_button"
          i18n:attributes="value" />
   <input type="submit" name="external_close_button"
-         class="standalone" value="Close"
+         class="standalone" value="Save & Close"
          onclick="window.opener.location.reload();window.close()"
          id="external_close_button"
Index: /WAeUP_SRP/base/skins/waeup_default/waeup_edit.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_default/waeup_edit.py	(revision 3356)
+++ /WAeUP_SRP/base/skins/waeup_default/waeup_edit.py	(revision 3357)
@@ -41,9 +41,17 @@
     new_values = dict([(k,v) for k,v in doc.getDataModel().items()])
     changed = [ k for k in old_values.keys() if new_values[k] != old_values[k]]
-    logger.info('%s edited %s %s (%s) of %s' % (member,
+    if student_id:
+        logger.info('%s edited %s object (fields %s) of %s' % (member, 
+                                                
+                                                context.id,
+                                                ', '.join(changed),
+                                                student_id))
+    else:
+        logger.info('%s edited %s %s (fields %s)' % (member, 
                                                 context.portal_type,
                                                 context.id,
-                                                ','.join(changed),
-                                                student_id))
+                                                ', '.join(changed),
+                                                ))    
+        
     psm = 'psm_content_changed'
     args = {}
