added check for system user