updated/cleaned up user settings code, like the newer org unit setter