Handle Retired Users Correctly
Merge branch 'tweaks' into development