Fix new user bug
Move user stuff to plan_user
Fix more plan_user problems