Fix for user rights and Accept/Cancel buttons