902 restrict owner degradation

Added #941 for that