Updated to work with latest configs and help with AD bind