Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py
===================================================================
--- management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py	(Revision 62389)
+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py	(Arbeitskopie)
@@ -1559,6 +1559,14 @@
 
 		self.old_options= copy.deepcopy( self.options )
 
+	def modify(self, *args, **kwargs):
+		try:
+			super(object, self).modify(*args, **kwargs)
+		except univention.admin.uexceptions.licenseDisableModify as exc:
+			if 'all' not in self['disabled']:
+				raise
+			kwargs['ignore_license'] = True
+			super(object, self).modify(*args, **kwargs)
 
 	def reload_certificate(self):
 		"""Reload user certificate."""