[OEM-143] Temporary fixes to laser admin (made obsolete by 1.6)