Enhance admin for edit mode & formasso field