Fixing admin link.
Partial merge with 19x