added condition to show user.login or user.name