Cleaning up user admin. Fixes #52