--HR-394 Fix for navigation error on roles screen