Fixed some issues with check for hrm user and group