Fix regex and add X-AUTH and X_AUTH options