Fix: https://gitlab.com/gitlab-com/peopleops/issues/167 Fix: https://gitlab.com/gitlab-com/peopleops/issues/132