Fixing some user stuff