More fixes for #1466
Fix {@user.role}