Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py	(revision 17141)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py	(revision 17142)
@@ -800,16 +800,12 @@
 
     def update(self):
-        if self.context.entry_mode not in ('ug_ft', 'de_ft'):
+        # Postgrad students should allowed to change their picture whenever they want.
+        if self.context.is_postgrad:
             return
         if self.context.is_jupeb:
             emit_lock_message(self)
             return            
-        PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.state not in PORTRAIT_CHANGE_STATES:
-            emit_lock_message(self)
-            return
         super(StudentFilesUploadPage, self).update()
         return
-
 
 
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py	(revision 17141)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py	(revision 17142)
@@ -63,5 +63,5 @@
             return  
         PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.state not in PORTRAIT_CHANGE_STATES:
+        if self.context.state not in PORTRAIT_CHANGE_STATES and not self.context.is_postgrad:
             return ''
         return self.view.url(self.view.context, self.target)
