Again minor changes to user stuff, cleaning things up