Implementing feature #17, second part. Implemented admin support