Fix for CADSRADMIN-7