Replace amo_user by user, simplyfing some code along the way (bug 1030981)
Merge pull request #2324 from diox/remove-amo-user

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