check if the user already has this, then skip

Issue #160
make sure the same db object is used throughout tx

Not sure if this is the issue Cyberpower raised, but something is up.

Issue #160
Merge branch 'rel6.2-hotfix'

Conflicts:
	acc.php
Merge branch 'master' of github.com:enwikipedia-acc/waca