User Enhancements #19 - done