Added fixes for become_user braindamage.