#123 Solving Admin services bug