LUN-455. Solve the admin issue. Needs one more test.