Remove secret key validations, add for username/pwd