Add better conditionals to charges controller