Replace amo_user by user, simplyfing some code along the way (bug 1030981)