Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py	(revision 17124)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py	(revision 17125)
@@ -800,11 +800,6 @@
 
     def update(self):
-        ## Uniben: Only 2020 session students are allowed to edit the picture.
-        #if self.context.entry_session != 2020:
-        #    emit_lock_message(self)
-        #    return
-        #if self.context.entry_mode not in ('ug_ft', 'de_ft'):
-        #    emit_lock_message(self)
-        #    return
+        if self.context.entry_mode not in ('ug_ft', 'de_ft'):
+            return
         if self.context.is_jupeb:
             emit_lock_message(self)
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py	(revision 17124)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py	(revision 17125)
@@ -57,9 +57,9 @@
     @property
     def target_url(self):
-        # Uniben: Only 2020 session students are allowed to edit the picture.
-        if self.context.entry_session != 2020:
-            return ''
         if self.context.entry_mode not in ('ug_ft', 'de_ft'):
             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:
