ADSelfService Plus Fixes and Enhancements - 2016