fix email not set problem (yep again)
making url matching more generic