Fix setup issues. LAST FINAL
email config changes