Alternative current user cleanup WIP

This seems a little cleaner than @gschorkopf's and my previous attempt.