Alternative current user cleanup

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